diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.errors.txt b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.errors.txt
index 4c707dfd861..6e65d46b9be 100644
--- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.errors.txt
+++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
+tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
==== tests/cases/conformance/internalModules/DeclarationMerging/class.ts (0 errors) ====
@@ -17,7 +17,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): erro
module X.Y {
export module Point {
~~~~~
-!!! error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
+!!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
export var Origin = new Point(0, 0);
}
}
diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.errors.txt b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.errors.txt
index 4c707dfd861..6e65d46b9be 100644
--- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.errors.txt
+++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
+tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
==== tests/cases/conformance/internalModules/DeclarationMerging/class.ts (0 errors) ====
@@ -17,7 +17,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): erro
module X.Y {
export module Point {
~~~~~
-!!! error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
+!!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
export var Origin = new Point(0, 0);
}
}
diff --git a/tests/baselines/reference/ExportAssignment7.errors.txt b/tests/baselines/reference/ExportAssignment7.errors.txt
index b72ca2d4a72..83651e10b8e 100644
--- a/tests/baselines/reference/ExportAssignment7.errors.txt
+++ b/tests/baselines/reference/ExportAssignment7.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/ExportAssignment7.ts(1,14): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/compiler/ExportAssignment7.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/compiler/ExportAssignment7.ts(4,1): error TS2309: An export assignment cannot be used in a module with other exported elements.
tests/cases/compiler/ExportAssignment7.ts(4,10): error TS2304: Cannot find name 'B'.
@@ -6,7 +6,7 @@ tests/cases/compiler/ExportAssignment7.ts(4,10): error TS2304: Cannot find name
==== tests/cases/compiler/ExportAssignment7.ts (3 errors) ====
export class C {
~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
}
export = B;
diff --git a/tests/baselines/reference/ExportAssignment8.errors.txt b/tests/baselines/reference/ExportAssignment8.errors.txt
index 4536f37bb81..d1a285cfe51 100644
--- a/tests/baselines/reference/ExportAssignment8.errors.txt
+++ b/tests/baselines/reference/ExportAssignment8.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/ExportAssignment8.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/compiler/ExportAssignment8.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/compiler/ExportAssignment8.ts(1,1): error TS2309: An export assignment cannot be used in a module with other exported elements.
tests/cases/compiler/ExportAssignment8.ts(1,10): error TS2304: Cannot find name 'B'.
@@ -6,7 +6,7 @@ tests/cases/compiler/ExportAssignment8.ts(1,10): error TS2304: Cannot find name
==== tests/cases/compiler/ExportAssignment8.ts (3 errors) ====
export = B;
~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
~~~~~~~~~~~
!!! error TS2309: An export assignment cannot be used in a module with other exported elements.
~
diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.errors.txt b/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.errors.txt
index df266681812..4f08e30cd46 100644
--- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.errors.txt
+++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
+tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(13,5): error TS2403: Subsequent variable declarations must have the same type. Variable 'fn' must be of type '() => { x: number; y: number; }', but here has type 'typeof Point'.
tests/cases/conformance/internalModules/DeclarationMerging/test.ts(2,5): error TS2403: Subsequent variable declarations must have the same type. Variable 'fn' must be of type '() => { x: number; y: number; }', but here has type 'typeof Point'.
@@ -14,7 +14,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/test.ts(2,5): error T
module A {
export module Point {
~~~~~
-!!! error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
+!!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
export var Origin = { x: 0, y: 0 };
}
}
diff --git a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.errors.txt b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.errors.txt
index 15a0e5b4334..ca840a719c0 100644
--- a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.errors.txt
+++ b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.errors.txt
@@ -1,12 +1,12 @@
-tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
-tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(1,8): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
+tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(1,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
==== tests/cases/conformance/internalModules/DeclarationMerging/module.ts (1 errors) ====
module X.Y {
export module Point {
~~~~~
-!!! error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
+!!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
export var Origin = new Point(0, 0);
}
}
@@ -27,7 +27,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(1,8): error
==== tests/cases/conformance/internalModules/DeclarationMerging/simple.ts (1 errors) ====
module A {
~
-!!! error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
export var Instance = new A();
}
diff --git a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.errors.txt b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.errors.txt
index 7c521c8be95..963ddf1ef93 100644
--- a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.errors.txt
+++ b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.errors.txt
@@ -1,12 +1,12 @@
-tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
-tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(3,19): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
+tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(3,19): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
==== tests/cases/conformance/internalModules/DeclarationMerging/module.ts (1 errors) ====
module A {
export module Point {
~~~~~
-!!! error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
+!!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
export var Origin = { x: 0, y: 0 };
}
}
@@ -24,7 +24,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(3,19): erro
export module Point {
~~~~~
-!!! error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
export var Origin = { x: 0, y: 0 };
}
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt
index 8a4962c23c7..fefdcd8f6f5 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/internalModules/DeclarationMerging/part1.ts(1,15): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/internalModules/DeclarationMerging/part1.ts(1,15): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(3,24): error TS2304: Cannot find name 'Point'.
tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(7,36): error TS2304: Cannot find name 'Point'.
tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(7,54): error TS2304: Cannot find name 'Point'.
@@ -7,7 +7,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(7,54): error
==== tests/cases/conformance/internalModules/DeclarationMerging/part1.ts (1 errors) ====
export module A {
~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
export interface Point {
x: number;
y: number;
diff --git a/tests/baselines/reference/ambientDeclarationsExternal.errors.txt b/tests/baselines/reference/ambientDeclarationsExternal.errors.txt
index 124bf928699..d05dfe813fd 100644
--- a/tests/baselines/reference/ambientDeclarationsExternal.errors.txt
+++ b/tests/baselines/reference/ambientDeclarationsExternal.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/ambient/consumer.ts(2,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/ambient/consumer.ts(2,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/ambient/consumer.ts (1 errors) ====
///
import imp1 = require('equ');
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
// Ambient external module members are always exported with or without export keyword when module lacks export assignment
diff --git a/tests/baselines/reference/ambientErrors.errors.txt b/tests/baselines/reference/ambientErrors.errors.txt
index a741536e078..16ce79a05dd 100644
--- a/tests/baselines/reference/ambientErrors.errors.txt
+++ b/tests/baselines/reference/ambientErrors.errors.txt
@@ -11,8 +11,8 @@ tests/cases/conformance/ambient/ambientErrors.ts(38,13): error TS1039: Initializ
tests/cases/conformance/ambient/ambientErrors.ts(39,23): error TS1184: An implementation cannot be declared in ambient contexts.
tests/cases/conformance/ambient/ambientErrors.ts(40,14): error TS1184: An implementation cannot be declared in ambient contexts.
tests/cases/conformance/ambient/ambientErrors.ts(41,22): error TS1184: An implementation cannot be declared in ambient contexts.
-tests/cases/conformance/ambient/ambientErrors.ts(47,20): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/conformance/ambient/ambientErrors.ts(51,16): error TS2436: Ambient external module declaration cannot specify relative module name.
+tests/cases/conformance/ambient/ambientErrors.ts(47,20): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/conformance/ambient/ambientErrors.ts(51,16): error TS2436: Ambient module declaration cannot specify relative module name.
tests/cases/conformance/ambient/ambientErrors.ts(57,5): error TS2309: An export assignment cannot be used in a module with other exported elements.
@@ -91,13 +91,13 @@ tests/cases/conformance/ambient/ambientErrors.ts(57,5): error TS2309: An export
module M2 {
declare module 'nope' { }
~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
}
// Ambient external module with a string literal name that isn't a top level external module name
declare module '../foo' { }
~~~~~~~~
-!!! error TS2436: Ambient external module declaration cannot specify relative module name.
+!!! error TS2436: Ambient module declaration cannot specify relative module name.
// Ambient external module with export assignment and other exported members
declare module 'bar' {
diff --git a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.errors.txt b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.errors.txt
index fb988131df0..79f37c4764e 100644
--- a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.errors.txt
+++ b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(5,16): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(10,22): error TS2307: Cannot find external module 'ext'.
+tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(5,16): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(10,22): error TS2307: Cannot find module 'ext'.
==== tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts (2 errors) ====
@@ -9,12 +9,12 @@ tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(10,22): err
declare module "ext" {
~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
export class C { }
}
// Cannot resolve this ext module reference
import ext = require("ext");
~~~~~
-!!! error TS2307: Cannot find external module 'ext'.
+!!! error TS2307: Cannot find module 'ext'.
var x = ext;
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.errors.txt b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.errors.txt
index e23f96803ba..87aae44840e 100644
--- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.errors.txt
+++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts(2,27): error TS2435: Ambient external modules cannot be nested in other modules.
+tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts(2,27): error TS2435: Ambient modules cannot be nested in other modules.
==== tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts (1 errors) ====
module M {
export declare module "M" { }
~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.errors.txt b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.errors.txt
index 92f01832926..763317ecc0c 100644
--- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.errors.txt
+++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts(1,23): error TS2435: Ambient external modules cannot be nested in other modules.
+tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts(1,23): error TS2435: Ambient modules cannot be nested in other modules.
==== tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts (1 errors) ====
export declare module "M" { }
~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
\ No newline at end of file
+!!! error TS2435: Ambient modules cannot be nested in other modules.
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.errors.txt b/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.errors.txt
index 72d7145969f..b7ccdc8df92 100644
--- a/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.errors.txt
+++ b/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.errors.txt
@@ -1,14 +1,14 @@
-tests/cases/compiler/ambientExternalModuleWithRelativeExternalImportDeclaration.ts(2,5): error TS2439: Import or export declaration in an ambient external module declaration cannot reference external module through relative external module name.
-tests/cases/compiler/ambientExternalModuleWithRelativeExternalImportDeclaration.ts(2,25): error TS2307: Cannot find external module './SubModule'.
+tests/cases/compiler/ambientExternalModuleWithRelativeExternalImportDeclaration.ts(2,5): error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name.
+tests/cases/compiler/ambientExternalModuleWithRelativeExternalImportDeclaration.ts(2,25): error TS2307: Cannot find module './SubModule'.
==== tests/cases/compiler/ambientExternalModuleWithRelativeExternalImportDeclaration.ts (2 errors) ====
declare module "OuterModule" {
import m2 = require("./SubModule");
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2439: Import or export declaration in an ambient external module declaration cannot reference external module through relative external module name.
+!!! error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name.
~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module './SubModule'.
+!!! error TS2307: Cannot find module './SubModule'.
class SubModule {
public static StaticVar: number;
public InstanceVar: number;
diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.errors.txt b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.errors.txt
index 7f6c0ff5b14..b85a7ad11a9 100644
--- a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.errors.txt
+++ b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.errors.txt
@@ -1,16 +1,16 @@
-tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts(1,16): error TS2436: Ambient external module declaration cannot specify relative module name.
-tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts(5,16): error TS2436: Ambient external module declaration cannot specify relative module name.
+tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts(1,16): error TS2436: Ambient module declaration cannot specify relative module name.
+tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts(5,16): error TS2436: Ambient module declaration cannot specify relative module name.
==== tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts (2 errors) ====
declare module "./relativeModule" {
~~~~~~~~~~~~~~~~~~
-!!! error TS2436: Ambient external module declaration cannot specify relative module name.
+!!! error TS2436: Ambient module declaration cannot specify relative module name.
var x: string;
}
declare module ".\\relativeModule" {
~~~~~~~~~~~~~~~~~~~
-!!! error TS2436: Ambient external module declaration cannot specify relative module name.
+!!! error TS2436: Ambient module declaration cannot specify relative module name.
var x: string;
}
\ No newline at end of file
diff --git a/tests/baselines/reference/amdDependencyComment1.errors.txt b/tests/baselines/reference/amdDependencyComment1.errors.txt
index 8e436a56547..f3b5a5c06cc 100644
--- a/tests/baselines/reference/amdDependencyComment1.errors.txt
+++ b/tests/baselines/reference/amdDependencyComment1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/amdDependencyComment1.ts(3,21): error TS2307: Cannot find external module 'm2'.
+tests/cases/compiler/amdDependencyComment1.ts(3,21): error TS2307: Cannot find module 'm2'.
==== tests/cases/compiler/amdDependencyComment1.ts (1 errors) ====
@@ -6,5 +6,5 @@ tests/cases/compiler/amdDependencyComment1.ts(3,21): error TS2307: Cannot find e
import m1 = require("m2")
~~~~
-!!! error TS2307: Cannot find external module 'm2'.
+!!! error TS2307: Cannot find module 'm2'.
m1.f();
\ No newline at end of file
diff --git a/tests/baselines/reference/amdDependencyComment2.errors.txt b/tests/baselines/reference/amdDependencyComment2.errors.txt
index bddd4e334e6..e7d81514b90 100644
--- a/tests/baselines/reference/amdDependencyComment2.errors.txt
+++ b/tests/baselines/reference/amdDependencyComment2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/amdDependencyComment2.ts(3,21): error TS2307: Cannot find external module 'm2'.
+tests/cases/compiler/amdDependencyComment2.ts(3,21): error TS2307: Cannot find module 'm2'.
==== tests/cases/compiler/amdDependencyComment2.ts (1 errors) ====
@@ -6,5 +6,5 @@ tests/cases/compiler/amdDependencyComment2.ts(3,21): error TS2307: Cannot find e
import m1 = require("m2")
~~~~
-!!! error TS2307: Cannot find external module 'm2'.
+!!! error TS2307: Cannot find module 'm2'.
m1.f();
\ No newline at end of file
diff --git a/tests/baselines/reference/amdDependencyCommentName1.errors.txt b/tests/baselines/reference/amdDependencyCommentName1.errors.txt
index 6ba879abc72..f9e29ffe4c9 100644
--- a/tests/baselines/reference/amdDependencyCommentName1.errors.txt
+++ b/tests/baselines/reference/amdDependencyCommentName1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/amdDependencyCommentName1.ts(3,21): error TS2307: Cannot find external module 'm2'.
+tests/cases/compiler/amdDependencyCommentName1.ts(3,21): error TS2307: Cannot find module 'm2'.
==== tests/cases/compiler/amdDependencyCommentName1.ts (1 errors) ====
@@ -6,5 +6,5 @@ tests/cases/compiler/amdDependencyCommentName1.ts(3,21): error TS2307: Cannot fi
import m1 = require("m2")
~~~~
-!!! error TS2307: Cannot find external module 'm2'.
+!!! error TS2307: Cannot find module 'm2'.
m1.f();
\ No newline at end of file
diff --git a/tests/baselines/reference/amdDependencyCommentName2.errors.txt b/tests/baselines/reference/amdDependencyCommentName2.errors.txt
index e3d6b8d16ec..de9350187ea 100644
--- a/tests/baselines/reference/amdDependencyCommentName2.errors.txt
+++ b/tests/baselines/reference/amdDependencyCommentName2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/amdDependencyCommentName2.ts(3,21): error TS2307: Cannot find external module 'm2'.
+tests/cases/compiler/amdDependencyCommentName2.ts(3,21): error TS2307: Cannot find module 'm2'.
==== tests/cases/compiler/amdDependencyCommentName2.ts (1 errors) ====
@@ -6,5 +6,5 @@ tests/cases/compiler/amdDependencyCommentName2.ts(3,21): error TS2307: Cannot fi
import m1 = require("m2")
~~~~
-!!! error TS2307: Cannot find external module 'm2'.
+!!! error TS2307: Cannot find module 'm2'.
m1.f();
\ No newline at end of file
diff --git a/tests/baselines/reference/amdDependencyCommentName3.errors.txt b/tests/baselines/reference/amdDependencyCommentName3.errors.txt
index a9342218c2c..6c3f1583314 100644
--- a/tests/baselines/reference/amdDependencyCommentName3.errors.txt
+++ b/tests/baselines/reference/amdDependencyCommentName3.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/amdDependencyCommentName3.ts(5,21): error TS2307: Cannot find external module 'm2'.
+tests/cases/compiler/amdDependencyCommentName3.ts(5,21): error TS2307: Cannot find module 'm2'.
==== tests/cases/compiler/amdDependencyCommentName3.ts (1 errors) ====
@@ -8,5 +8,5 @@ tests/cases/compiler/amdDependencyCommentName3.ts(5,21): error TS2307: Cannot fi
import m1 = require("m2")
~~~~
-!!! error TS2307: Cannot find external module 'm2'.
+!!! error TS2307: Cannot find module 'm2'.
m1.f();
\ No newline at end of file
diff --git a/tests/baselines/reference/amdDependencyCommentName4.errors.txt b/tests/baselines/reference/amdDependencyCommentName4.errors.txt
index 6b32830e51c..8031a651d0a 100644
--- a/tests/baselines/reference/amdDependencyCommentName4.errors.txt
+++ b/tests/baselines/reference/amdDependencyCommentName4.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/compiler/amdDependencyCommentName4.ts(8,21): error TS2307: Cannot find external module 'aliasedModule1'.
-tests/cases/compiler/amdDependencyCommentName4.ts(11,26): error TS2307: Cannot find external module 'aliasedModule2'.
-tests/cases/compiler/amdDependencyCommentName4.ts(14,15): error TS2307: Cannot find external module 'aliasedModule3'.
-tests/cases/compiler/amdDependencyCommentName4.ts(17,21): error TS2307: Cannot find external module 'aliasedModule4'.
+tests/cases/compiler/amdDependencyCommentName4.ts(8,21): error TS2307: Cannot find module 'aliasedModule1'.
+tests/cases/compiler/amdDependencyCommentName4.ts(11,26): error TS2307: Cannot find module 'aliasedModule2'.
+tests/cases/compiler/amdDependencyCommentName4.ts(14,15): error TS2307: Cannot find module 'aliasedModule3'.
+tests/cases/compiler/amdDependencyCommentName4.ts(17,21): error TS2307: Cannot find module 'aliasedModule4'.
==== tests/cases/compiler/amdDependencyCommentName4.ts (4 errors) ====
@@ -14,22 +14,22 @@ tests/cases/compiler/amdDependencyCommentName4.ts(17,21): error TS2307: Cannot f
import r1 = require("aliasedModule1");
~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'aliasedModule1'.
+!!! error TS2307: Cannot find module 'aliasedModule1'.
r1;
import {p1, p2, p3} from "aliasedModule2";
~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'aliasedModule2'.
+!!! error TS2307: Cannot find module 'aliasedModule2'.
p1;
import d from "aliasedModule3";
~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'aliasedModule3'.
+!!! error TS2307: Cannot find module 'aliasedModule3'.
d;
import * as ns from "aliasedModule4";
~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'aliasedModule4'.
+!!! error TS2307: Cannot find module 'aliasedModule4'.
ns;
import "unaliasedModule2";
\ No newline at end of file
diff --git a/tests/baselines/reference/augmentedTypesModules.errors.txt b/tests/baselines/reference/augmentedTypesModules.errors.txt
index 980837a18ef..5ece0710e43 100644
--- a/tests/baselines/reference/augmentedTypesModules.errors.txt
+++ b/tests/baselines/reference/augmentedTypesModules.errors.txt
@@ -4,9 +4,9 @@ tests/cases/compiler/augmentedTypesModules.ts(8,8): error TS2300: Duplicate iden
tests/cases/compiler/augmentedTypesModules.ts(9,5): error TS2300: Duplicate identifier 'm1b'.
tests/cases/compiler/augmentedTypesModules.ts(16,8): error TS2300: Duplicate identifier 'm1d'.
tests/cases/compiler/augmentedTypesModules.ts(19,5): error TS2300: Duplicate identifier 'm1d'.
-tests/cases/compiler/augmentedTypesModules.ts(25,8): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
-tests/cases/compiler/augmentedTypesModules.ts(28,8): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
-tests/cases/compiler/augmentedTypesModules.ts(51,8): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+tests/cases/compiler/augmentedTypesModules.ts(25,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
+tests/cases/compiler/augmentedTypesModules.ts(28,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
+tests/cases/compiler/augmentedTypesModules.ts(51,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
==== tests/cases/compiler/augmentedTypesModules.ts (9 errors) ====
@@ -48,12 +48,12 @@ tests/cases/compiler/augmentedTypesModules.ts(51,8): error TS2434: A module decl
module m2a { var y = 2; }
~~~
-!!! error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
function m2a() { }; // error since the module is instantiated
module m2b { export var y = 2; }
~~~
-!!! error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
function m2b() { }; // error since the module is instantiated
// should be errors to have function first
@@ -78,7 +78,7 @@ tests/cases/compiler/augmentedTypesModules.ts(51,8): error TS2434: A module decl
module m3a { var y = 2; }
~~~
-!!! error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
class m3a { foo() { } } // error, class isn't ambient or declared before the module
class m3b { foo() { } }
diff --git a/tests/baselines/reference/augmentedTypesModules2.errors.txt b/tests/baselines/reference/augmentedTypesModules2.errors.txt
index 19c87a14913..be847d88830 100644
--- a/tests/baselines/reference/augmentedTypesModules2.errors.txt
+++ b/tests/baselines/reference/augmentedTypesModules2.errors.txt
@@ -1,6 +1,6 @@
-tests/cases/compiler/augmentedTypesModules2.ts(5,8): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
-tests/cases/compiler/augmentedTypesModules2.ts(8,8): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
-tests/cases/compiler/augmentedTypesModules2.ts(14,8): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+tests/cases/compiler/augmentedTypesModules2.ts(5,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
+tests/cases/compiler/augmentedTypesModules2.ts(8,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
+tests/cases/compiler/augmentedTypesModules2.ts(14,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
==== tests/cases/compiler/augmentedTypesModules2.ts (3 errors) ====
@@ -10,12 +10,12 @@ tests/cases/compiler/augmentedTypesModules2.ts(14,8): error TS2434: A module dec
module m2a { var y = 2; }
~~~
-!!! error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
function m2a() { }; // error since the module is instantiated
module m2b { export var y = 2; }
~~~
-!!! error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
function m2b() { }; // error since the module is instantiated
function m2c() { };
@@ -23,7 +23,7 @@ tests/cases/compiler/augmentedTypesModules2.ts(14,8): error TS2434: A module dec
module m2cc { export var y = 2; }
~~~~
-!!! error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
function m2cc() { }; // error to have module first
module m2d { }
diff --git a/tests/baselines/reference/augmentedTypesModules3.errors.txt b/tests/baselines/reference/augmentedTypesModules3.errors.txt
index e264c74463c..8e1bd706271 100644
--- a/tests/baselines/reference/augmentedTypesModules3.errors.txt
+++ b/tests/baselines/reference/augmentedTypesModules3.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/augmentedTypesModules3.ts(5,8): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+tests/cases/compiler/augmentedTypesModules3.ts(5,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
==== tests/cases/compiler/augmentedTypesModules3.ts (1 errors) ====
@@ -8,5 +8,5 @@ tests/cases/compiler/augmentedTypesModules3.ts(5,8): error TS2434: A module decl
module m3a { var y = 2; }
~~~
-!!! error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
class m3a { foo() { } } // error, class isn't ambient or declared before the module
\ No newline at end of file
diff --git a/tests/baselines/reference/badExternalModuleReference.errors.txt b/tests/baselines/reference/badExternalModuleReference.errors.txt
index 96ac4224222..e5caaaf296f 100644
--- a/tests/baselines/reference/badExternalModuleReference.errors.txt
+++ b/tests/baselines/reference/badExternalModuleReference.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/compiler/badExternalModuleReference.ts(1,21): error TS2307: Cannot find external module 'garbage'.
+tests/cases/compiler/badExternalModuleReference.ts(1,21): error TS2307: Cannot find module 'garbage'.
==== tests/cases/compiler/badExternalModuleReference.ts (1 errors) ====
import a1 = require("garbage");
~~~~~~~~~
-!!! error TS2307: Cannot find external module 'garbage'.
+!!! error TS2307: Cannot find module 'garbage'.
export declare var a: {
test1: a1.connectModule;
(): a1.connectExport;
diff --git a/tests/baselines/reference/circularReference.errors.txt b/tests/baselines/reference/circularReference.errors.txt
index 667d1ca895d..5e0a6208a1e 100644
--- a/tests/baselines/reference/circularReference.errors.txt
+++ b/tests/baselines/reference/circularReference.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/externalModules/foo1.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/externalModules/foo1.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/externalModules/foo1.ts(9,12): error TS2339: Property 'x' does not exist on type 'C1'.
tests/cases/conformance/externalModules/foo2.ts(8,12): error TS2339: Property 'y' does not exist on type 'C1'.
tests/cases/conformance/externalModules/foo2.ts(13,8): error TS2339: Property 'x' does not exist on type 'C1'.
@@ -29,7 +29,7 @@ tests/cases/conformance/externalModules/foo2.ts(13,8): error TS2339: Property 'x
==== tests/cases/conformance/externalModules/foo1.ts (2 errors) ====
import foo2 = require('./foo2');
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
export module M1 {
export class C1 {
m1: foo2.M1.C1;
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt
index f396b722263..47adb957141 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(4,14): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(4,14): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(8,21): error TS2301: Initializer of instance member variable 'messageHandler' cannot reference identifier 'field1' declared in the constructor.
@@ -11,7 +11,7 @@ tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(8,21): error T
};
export class Test1 {
~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
constructor(private field1: string) {
}
messageHandler = () => {
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt
index 84e7994fd0c..9d1a2dd3418 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(8,21): error TS2304: Cannot find name 'field1'.
==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts (1 errors) ====
export var field1: string;
~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts (1 errors) ====
declare var console: {
diff --git a/tests/baselines/reference/cloduleSplitAcrossFiles.errors.txt b/tests/baselines/reference/cloduleSplitAcrossFiles.errors.txt
index e9001265feb..2de3141da54 100644
--- a/tests/baselines/reference/cloduleSplitAcrossFiles.errors.txt
+++ b/tests/baselines/reference/cloduleSplitAcrossFiles.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/cloduleSplitAcrossFiles_module.ts(1,8): error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
+tests/cases/compiler/cloduleSplitAcrossFiles_module.ts(1,8): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
==== tests/cases/compiler/cloduleSplitAcrossFiles_class.ts (0 errors) ====
@@ -7,7 +7,7 @@ tests/cases/compiler/cloduleSplitAcrossFiles_module.ts(1,8): error TS2433: A mod
==== tests/cases/compiler/cloduleSplitAcrossFiles_module.ts (1 errors) ====
module D {
~
-!!! error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
+!!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
export var y = "hi";
}
D.y;
\ No newline at end of file
diff --git a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.errors.txt b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.errors.txt
index 1b0d9cf13ca..0f23d5c9a15 100644
--- a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.errors.txt
+++ b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/cloduleWithPriorInstantiatedModule.ts(2,8): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+tests/cases/compiler/cloduleWithPriorInstantiatedModule.ts(2,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
==== tests/cases/compiler/cloduleWithPriorInstantiatedModule.ts (1 errors) ====
// Non-ambient & instantiated module.
module Moclodule {
~~~~~~~~~
-!!! error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
export interface Someinterface {
foo(): void;
}
diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.errors.txt b/tests/baselines/reference/collisionExportsRequireAndAlias.errors.txt
index e782abd08b8..4273e3bb436 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAlias.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndAlias.errors.txt
@@ -1,14 +1,14 @@
-tests/cases/compiler/collisionExportsRequireAndAlias_file2.ts(1,8): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of an external module.
-tests/cases/compiler/collisionExportsRequireAndAlias_file2.ts(2,8): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of an external module.
+tests/cases/compiler/collisionExportsRequireAndAlias_file2.ts(1,8): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
+tests/cases/compiler/collisionExportsRequireAndAlias_file2.ts(2,8): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
==== tests/cases/compiler/collisionExportsRequireAndAlias_file2.ts (2 errors) ====
import require = require('collisionExportsRequireAndAlias_file1'); // Error
~~~~~~~
-!!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of an external module.
+!!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
import exports = require('collisionExportsRequireAndAlias_file3333'); // Error
~~~~~~~
-!!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of an external module.
+!!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
export function foo() {
require.bar();
}
diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.errors.txt b/tests/baselines/reference/collisionExportsRequireAndClass.errors.txt
index ef0a9018f1d..d443a1ad308 100644
--- a/tests/baselines/reference/collisionExportsRequireAndClass.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndClass.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/compiler/collisionExportsRequireAndClass_externalmodule.ts(1,14): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of an external module.
-tests/cases/compiler/collisionExportsRequireAndClass_externalmodule.ts(3,14): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of an external module.
+tests/cases/compiler/collisionExportsRequireAndClass_externalmodule.ts(1,14): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
+tests/cases/compiler/collisionExportsRequireAndClass_externalmodule.ts(3,14): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
==== tests/cases/compiler/collisionExportsRequireAndClass_externalmodule.ts (2 errors) ====
export class require {
~~~~~~~
-!!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of an external module.
+!!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
}
export class exports {
~~~~~~~
-!!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of an external module.
+!!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
}
module m1 {
class require {
diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.errors.txt b/tests/baselines/reference/collisionExportsRequireAndEnum.errors.txt
index d421cbe4d4b..fce7e932682 100644
--- a/tests/baselines/reference/collisionExportsRequireAndEnum.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndEnum.errors.txt
@@ -1,17 +1,17 @@
-tests/cases/compiler/collisionExportsRequireAndEnum_externalmodule.ts(1,13): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of an external module.
-tests/cases/compiler/collisionExportsRequireAndEnum_externalmodule.ts(5,13): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of an external module.
+tests/cases/compiler/collisionExportsRequireAndEnum_externalmodule.ts(1,13): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
+tests/cases/compiler/collisionExportsRequireAndEnum_externalmodule.ts(5,13): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
==== tests/cases/compiler/collisionExportsRequireAndEnum_externalmodule.ts (2 errors) ====
export enum require { // Error
~~~~~~~
-!!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of an external module.
+!!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
_thisVal1,
_thisVal2,
}
export enum exports { // Error
~~~~~~~
-!!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of an external module.
+!!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
_thisVal1,
_thisVal2,
}
diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.errors.txt b/tests/baselines/reference/collisionExportsRequireAndFunction.errors.txt
index f52390ec28c..e7052759bc9 100644
--- a/tests/baselines/reference/collisionExportsRequireAndFunction.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndFunction.errors.txt
@@ -1,16 +1,16 @@
-tests/cases/compiler/collisionExportsRequireAndFunction.ts(1,17): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of an external module.
-tests/cases/compiler/collisionExportsRequireAndFunction.ts(4,17): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of an external module.
+tests/cases/compiler/collisionExportsRequireAndFunction.ts(1,17): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
+tests/cases/compiler/collisionExportsRequireAndFunction.ts(4,17): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
==== tests/cases/compiler/collisionExportsRequireAndFunction.ts (2 errors) ====
export function exports() {
~~~~~~~
-!!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of an external module.
+!!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
return 1;
}
export function require() {
~~~~~~~
-!!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of an external module.
+!!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
return "require";
}
module m1 {
diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.errors.txt b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.errors.txt
index 4207db04f53..569fad94f68 100644
--- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts(5,8): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of an external module.
-tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts(6,8): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of an external module.
+tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts(5,8): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
+tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts(6,8): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
==== tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts (2 errors) ====
@@ -9,10 +9,10 @@ tests/cases/compiler/collisionExportsRequireAndInternalModuleAlias.ts(6,8): erro
}
import exports = m.c;
~~~~~~~
-!!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of an external module.
+!!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
import require = m.c;
~~~~~~~
-!!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of an external module.
+!!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
new exports();
new require();
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt b/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt
index cb11155718e..f08bf611e05 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/collisionExportsRequireAndModule_externalmodule.ts(1,15): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of an external module.
-tests/cases/compiler/collisionExportsRequireAndModule_externalmodule.ts(10,15): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of an external module.
+tests/cases/compiler/collisionExportsRequireAndModule_externalmodule.ts(1,15): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
+tests/cases/compiler/collisionExportsRequireAndModule_externalmodule.ts(10,15): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
==== tests/cases/compiler/collisionExportsRequireAndModule_externalmodule.ts (2 errors) ====
export module require {
~~~~~~~
-!!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of an external module.
+!!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
export interface I {
}
export class C {
@@ -16,7 +16,7 @@ tests/cases/compiler/collisionExportsRequireAndModule_externalmodule.ts(10,15):
}
export module exports {
~~~~~~~
-!!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of an external module.
+!!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
export interface I {
}
export class C {
diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.errors.txt b/tests/baselines/reference/collisionExportsRequireAndVar.errors.txt
index 2efc84d5436..af7007c25f0 100644
--- a/tests/baselines/reference/collisionExportsRequireAndVar.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndVar.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/collisionExportsRequireAndVar_externalmodule.ts(3,5): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of an external module.
-tests/cases/compiler/collisionExportsRequireAndVar_externalmodule.ts(4,5): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of an external module.
+tests/cases/compiler/collisionExportsRequireAndVar_externalmodule.ts(3,5): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
+tests/cases/compiler/collisionExportsRequireAndVar_externalmodule.ts(4,5): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
==== tests/cases/compiler/collisionExportsRequireAndVar_externalmodule.ts (2 errors) ====
@@ -7,10 +7,10 @@ tests/cases/compiler/collisionExportsRequireAndVar_externalmodule.ts(4,5): error
}
var exports = 1;
~~~~~~~
-!!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of an external module.
+!!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
var require = "require";
~~~~~~~
-!!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of an external module.
+!!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
module m1 {
var exports = 0;
var require = "require";
diff --git a/tests/baselines/reference/commentOnImportStatement1.errors.txt b/tests/baselines/reference/commentOnImportStatement1.errors.txt
index 26a725a8f7c..c6dcaf31c4f 100644
--- a/tests/baselines/reference/commentOnImportStatement1.errors.txt
+++ b/tests/baselines/reference/commentOnImportStatement1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/commentOnImportStatement1.ts(3,22): error TS2307: Cannot find external module './foo'.
+tests/cases/compiler/commentOnImportStatement1.ts(3,22): error TS2307: Cannot find module './foo'.
==== tests/cases/compiler/commentOnImportStatement1.ts (1 errors) ====
@@ -6,5 +6,5 @@ tests/cases/compiler/commentOnImportStatement1.ts(3,22): error TS2307: Cannot fi
import foo = require('./foo');
~~~~~~~
-!!! error TS2307: Cannot find external module './foo'.
+!!! error TS2307: Cannot find module './foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/commentOnImportStatement2.errors.txt b/tests/baselines/reference/commentOnImportStatement2.errors.txt
index a2ea6c19d6e..31f11a1c148 100644
--- a/tests/baselines/reference/commentOnImportStatement2.errors.txt
+++ b/tests/baselines/reference/commentOnImportStatement2.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/compiler/commentOnImportStatement2.ts(2,22): error TS2307: Cannot find external module './foo'.
+tests/cases/compiler/commentOnImportStatement2.ts(2,22): error TS2307: Cannot find module './foo'.
==== tests/cases/compiler/commentOnImportStatement2.ts (1 errors) ====
/* not copyright */
import foo = require('./foo');
~~~~~~~
-!!! error TS2307: Cannot find external module './foo'.
\ No newline at end of file
+!!! error TS2307: Cannot find module './foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/commentOnImportStatement3.errors.txt b/tests/baselines/reference/commentOnImportStatement3.errors.txt
index 427bcf3aef7..ec47c42dc41 100644
--- a/tests/baselines/reference/commentOnImportStatement3.errors.txt
+++ b/tests/baselines/reference/commentOnImportStatement3.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/commentOnImportStatement3.ts(4,22): error TS2307: Cannot find external module './foo'.
+tests/cases/compiler/commentOnImportStatement3.ts(4,22): error TS2307: Cannot find module './foo'.
==== tests/cases/compiler/commentOnImportStatement3.ts (1 errors) ====
@@ -7,4 +7,4 @@ tests/cases/compiler/commentOnImportStatement3.ts(4,22): error TS2307: Cannot fi
/* not copyright */
import foo = require('./foo');
~~~~~~~
-!!! error TS2307: Cannot find external module './foo'.
\ No newline at end of file
+!!! error TS2307: Cannot find module './foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames19_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames19_ES5.errors.txt
index 49a1f008a05..ecbe59ccd1c 100644
--- a/tests/baselines/reference/computedPropertyNames19_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames19_ES5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES5.ts(3,10): error TS2331: 'this' cannot be referenced in a module body.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES5.ts(3,10): error TS2331: 'this' cannot be referenced in a module or namespace body.
==== tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES5.ts (1 errors) ====
@@ -6,6 +6,6 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES5.ts(3,
var obj = {
[this.bar]: 0
~~~~
-!!! error TS2331: 'this' cannot be referenced in a module body.
+!!! error TS2331: 'this' cannot be referenced in a module or namespace body.
}
}
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames19_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames19_ES6.errors.txt
index 9e2d1afbe74..9a18ba4a631 100644
--- a/tests/baselines/reference/computedPropertyNames19_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames19_ES6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES6.ts(3,10): error TS2331: 'this' cannot be referenced in a module body.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES6.ts(3,10): error TS2331: 'this' cannot be referenced in a module or namespace body.
==== tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES6.ts (1 errors) ====
@@ -6,6 +6,6 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES6.ts(3,
var obj = {
[this.bar]: 0
~~~~
-!!! error TS2331: 'this' cannot be referenced in a module body.
+!!! error TS2331: 'this' cannot be referenced in a module or namespace body.
}
}
\ No newline at end of file
diff --git a/tests/baselines/reference/constDeclarations-access5.errors.txt b/tests/baselines/reference/constDeclarations-access5.errors.txt
index e689bbf8b4e..17b91deae88 100644
--- a/tests/baselines/reference/constDeclarations-access5.errors.txt
+++ b/tests/baselines/reference/constDeclarations-access5.errors.txt
@@ -1,4 +1,4 @@
-error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
tests/cases/compiler/constDeclarations_access_2.ts(2,1): error TS1202: Import assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'import * as ns from "mod"', 'import {a} from "mod"' or 'import d from "mod"' instead.
tests/cases/compiler/constDeclarations_access_2.ts(4,1): error TS2450: Left-hand side of assignment expression cannot be a constant.
tests/cases/compiler/constDeclarations_access_2.ts(5,1): error TS2450: Left-hand side of assignment expression cannot be a constant.
@@ -20,7 +20,7 @@ tests/cases/compiler/constDeclarations_access_2.ts(22,3): error TS2449: The oper
tests/cases/compiler/constDeclarations_access_2.ts(24,1): error TS2450: Left-hand side of assignment expression cannot be a constant.
-!!! error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
==== tests/cases/compiler/constDeclarations_access_2.ts (19 errors) ====
///
import m = require('constDeclarations_access_1');
diff --git a/tests/baselines/reference/copyrightWithNewLine1.errors.txt b/tests/baselines/reference/copyrightWithNewLine1.errors.txt
index 680d783a1d9..11c34ed86a7 100644
--- a/tests/baselines/reference/copyrightWithNewLine1.errors.txt
+++ b/tests/baselines/reference/copyrightWithNewLine1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/copyrightWithNewLine1.ts(5,24): error TS2307: Cannot find external module './greeter'.
+tests/cases/compiler/copyrightWithNewLine1.ts(5,24): error TS2307: Cannot find module './greeter'.
tests/cases/compiler/copyrightWithNewLine1.ts(6,10): error TS2304: Cannot find name 'document'.
@@ -9,7 +9,7 @@ tests/cases/compiler/copyrightWithNewLine1.ts(6,10): error TS2304: Cannot find n
import model = require("./greeter")
~~~~~~~~~~~
-!!! error TS2307: Cannot find external module './greeter'.
+!!! error TS2307: Cannot find module './greeter'.
var el = document.getElementById('content');
~~~~~~~~
!!! error TS2304: Cannot find name 'document'.
diff --git a/tests/baselines/reference/copyrightWithoutNewLine1.errors.txt b/tests/baselines/reference/copyrightWithoutNewLine1.errors.txt
index a4f792f2dae..d7f5f3129c7 100644
--- a/tests/baselines/reference/copyrightWithoutNewLine1.errors.txt
+++ b/tests/baselines/reference/copyrightWithoutNewLine1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/copyrightWithoutNewLine1.ts(4,24): error TS2307: Cannot find external module './greeter'.
+tests/cases/compiler/copyrightWithoutNewLine1.ts(4,24): error TS2307: Cannot find module './greeter'.
tests/cases/compiler/copyrightWithoutNewLine1.ts(5,10): error TS2304: Cannot find name 'document'.
@@ -8,7 +8,7 @@ tests/cases/compiler/copyrightWithoutNewLine1.ts(5,10): error TS2304: Cannot fin
****************************/
import model = require("./greeter")
~~~~~~~~~~~
-!!! error TS2307: Cannot find external module './greeter'.
+!!! error TS2307: Cannot find module './greeter'.
var el = document.getElementById('content');
~~~~~~~~
!!! error TS2304: Cannot find name 'document'.
diff --git a/tests/baselines/reference/decoratorOnClassMethod11.errors.txt b/tests/baselines/reference/decoratorOnClassMethod11.errors.txt
index 5e56c0b62a8..8e284f496a2 100644
--- a/tests/baselines/reference/decoratorOnClassMethod11.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassMethod11.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts(5,10): error TS2331: 'this' cannot be referenced in a module body.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts(5,10): error TS2331: 'this' cannot be referenced in a module or namespace body.
==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts (1 errors) ====
@@ -8,7 +8,7 @@ tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts(5,10
@this.decorator
~~~~
-!!! error TS2331: 'this' cannot be referenced in a module body.
+!!! error TS2331: 'this' cannot be referenced in a module or namespace body.
method() { }
}
}
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateExportAssignments.errors.txt b/tests/baselines/reference/duplicateExportAssignments.errors.txt
index c0a93076981..47a97f9d8af 100644
--- a/tests/baselines/reference/duplicateExportAssignments.errors.txt
+++ b/tests/baselines/reference/duplicateExportAssignments.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/externalModules/foo1.ts(3,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/externalModules/foo1.ts(3,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/externalModules/foo1.ts(3,1): error TS2300: Duplicate identifier 'export='.
tests/cases/conformance/externalModules/foo1.ts(4,1): error TS2300: Duplicate identifier 'export='.
tests/cases/conformance/externalModules/foo2.ts(3,1): error TS2300: Duplicate identifier 'export='.
@@ -17,7 +17,7 @@ tests/cases/conformance/externalModules/foo5.ts(6,1): error TS2300: Duplicate id
var y = 20;
export = x;
~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
~~~~~~~~~~~
!!! error TS2300: Duplicate identifier 'export='.
export = y;
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt b/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt
index 768e6111b73..df4f8f13c31 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt
@@ -9,7 +9,7 @@ tests/cases/compiler/duplicateSymbolsExportMatching.ts(43,16): error TS2395: Ind
tests/cases/compiler/duplicateSymbolsExportMatching.ts(44,9): error TS2395: Individual declarations in merged declaration w must be all exported or all local.
tests/cases/compiler/duplicateSymbolsExportMatching.ts(45,16): error TS2395: Individual declarations in merged declaration w must be all exported or all local.
tests/cases/compiler/duplicateSymbolsExportMatching.ts(49,12): error TS2395: Individual declarations in merged declaration F must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(49,12): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(49,12): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
tests/cases/compiler/duplicateSymbolsExportMatching.ts(52,21): error TS2395: Individual declarations in merged declaration F must be all exported or all local.
tests/cases/compiler/duplicateSymbolsExportMatching.ts(56,11): error TS2395: Individual declarations in merged declaration C must be all exported or all local.
tests/cases/compiler/duplicateSymbolsExportMatching.ts(57,12): error TS2395: Individual declarations in merged declaration C must be all exported or all local.
@@ -91,7 +91,7 @@ tests/cases/compiler/duplicateSymbolsExportMatching.ts(65,18): error TS2395: Ind
~
!!! error TS2395: Individual declarations in merged declaration F must be all exported or all local.
~
-!!! error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
var t;
}
export function F() { } // Only one error for duplicate identifier (don't consider visibility)
diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt b/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt
index 65f29984d59..f51ff27a412 100644
--- a/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt
+++ b/tests/baselines/reference/es5ModuleInternalNamedImports.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/es5ModuleInternalNamedImports.ts(23,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es5ModuleInternalNamedImports.ts(24,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es5ModuleInternalNamedImports.ts(25,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es5ModuleInternalNamedImports.ts(26,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es5ModuleInternalNamedImports.ts(27,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es5ModuleInternalNamedImports.ts(28,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es5ModuleInternalNamedImports.ts(29,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es5ModuleInternalNamedImports.ts(30,5): error TS1194: Export declarations are not permitted in an internal module.
+tests/cases/compiler/es5ModuleInternalNamedImports.ts(23,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es5ModuleInternalNamedImports.ts(24,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es5ModuleInternalNamedImports.ts(25,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es5ModuleInternalNamedImports.ts(26,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es5ModuleInternalNamedImports.ts(27,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es5ModuleInternalNamedImports.ts(28,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es5ModuleInternalNamedImports.ts(29,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es5ModuleInternalNamedImports.ts(30,5): error TS1194: Export declarations are not permitted in a namespace.
==== tests/cases/compiler/es5ModuleInternalNamedImports.ts (8 errors) ====
@@ -33,27 +33,27 @@ tests/cases/compiler/es5ModuleInternalNamedImports.ts(30,5): error TS1194: Expor
// Reexports
export {M_V as v};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_I as i};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_C as c};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_M as m};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_MU as mu};
~~~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_F as f};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_E as e};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_A as a};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.errors.txt b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.errors.txt
index 25e64fc72d0..faf27a85206 100644
--- a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.errors.txt
+++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/compiler/es5ModuleWithoutModuleGenTarget.ts(1,14): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/compiler/es5ModuleWithoutModuleGenTarget.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/compiler/es5ModuleWithoutModuleGenTarget.ts (1 errors) ====
export class A
~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
{
constructor ()
{
diff --git a/tests/baselines/reference/es6-amd.errors.txt b/tests/baselines/reference/es6-amd.errors.txt
index e1e44b4a493..eab88c7255a 100644
--- a/tests/baselines/reference/es6-amd.errors.txt
+++ b/tests/baselines/reference/es6-amd.errors.txt
@@ -1,7 +1,7 @@
-error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
-!!! error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
==== tests/cases/compiler/es6-amd.ts (0 errors) ====
class A
diff --git a/tests/baselines/reference/es6-declaration-amd.errors.txt b/tests/baselines/reference/es6-declaration-amd.errors.txt
index 30cf14f0861..e675d6458fa 100644
--- a/tests/baselines/reference/es6-declaration-amd.errors.txt
+++ b/tests/baselines/reference/es6-declaration-amd.errors.txt
@@ -1,7 +1,7 @@
-error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
-!!! error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
==== tests/cases/compiler/es6-declaration-amd.ts (0 errors) ====
class A
diff --git a/tests/baselines/reference/es6-sourcemap-amd.errors.txt b/tests/baselines/reference/es6-sourcemap-amd.errors.txt
index da8968e9d5e..d929248bd62 100644
--- a/tests/baselines/reference/es6-sourcemap-amd.errors.txt
+++ b/tests/baselines/reference/es6-sourcemap-amd.errors.txt
@@ -1,7 +1,7 @@
-error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
-!!! error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
==== tests/cases/compiler/es6-sourcemap-amd.ts (0 errors) ====
class A
diff --git a/tests/baselines/reference/es6-umd.errors.txt b/tests/baselines/reference/es6-umd.errors.txt
index 874b41552c5..4a896532795 100644
--- a/tests/baselines/reference/es6-umd.errors.txt
+++ b/tests/baselines/reference/es6-umd.errors.txt
@@ -1,7 +1,7 @@
-error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
-!!! error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
==== tests/cases/compiler/es6-umd.ts (0 errors) ====
class A
diff --git a/tests/baselines/reference/es6-umd2.errors.txt b/tests/baselines/reference/es6-umd2.errors.txt
index 88d732df122..8d8aa0185d3 100644
--- a/tests/baselines/reference/es6-umd2.errors.txt
+++ b/tests/baselines/reference/es6-umd2.errors.txt
@@ -1,7 +1,7 @@
-error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
-!!! error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
==== tests/cases/compiler/es6-umd2.ts (0 errors) ====
export class A
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.errors.txt b/tests/baselines/reference/es6ExportEqualsInterop.errors.txt
index 7cc84187145..98e39cf73e7 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.errors.txt
+++ b/tests/baselines/reference/es6ExportEqualsInterop.errors.txt
@@ -1,35 +1,35 @@
tests/cases/compiler/main.ts(15,1): error TS2304: Cannot find name 'z1'.
tests/cases/compiler/main.ts(21,4): error TS2339: Property 'a' does not exist on type '() => any'.
tests/cases/compiler/main.ts(23,4): error TS2339: Property 'a' does not exist on type 'typeof Foo'.
-tests/cases/compiler/main.ts(27,8): error TS1192: External module '"interface"' has no default export.
-tests/cases/compiler/main.ts(28,8): error TS1192: External module '"variable"' has no default export.
-tests/cases/compiler/main.ts(29,8): error TS1192: External module '"interface-variable"' has no default export.
-tests/cases/compiler/main.ts(30,8): error TS1192: External module '"module"' has no default export.
-tests/cases/compiler/main.ts(31,8): error TS1192: External module '"interface-module"' has no default export.
-tests/cases/compiler/main.ts(32,8): error TS1192: External module '"variable-module"' has no default export.
-tests/cases/compiler/main.ts(33,8): error TS1192: External module '"function"' has no default export.
-tests/cases/compiler/main.ts(34,8): error TS1192: External module '"function-module"' has no default export.
-tests/cases/compiler/main.ts(35,8): error TS1192: External module '"class"' has no default export.
-tests/cases/compiler/main.ts(36,8): error TS1192: External module '"class-module"' has no default export.
-tests/cases/compiler/main.ts(39,21): error TS2497: External module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
-tests/cases/compiler/main.ts(45,21): error TS2497: External module '"function"' resolves to a non-module entity and cannot be imported using this construct.
-tests/cases/compiler/main.ts(47,21): error TS2497: External module '"class"' resolves to a non-module entity and cannot be imported using this construct.
-tests/cases/compiler/main.ts(62,25): error TS2497: External module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
-tests/cases/compiler/main.ts(68,25): error TS2497: External module '"function"' resolves to a non-module entity and cannot be imported using this construct.
-tests/cases/compiler/main.ts(70,25): error TS2497: External module '"class"' resolves to a non-module entity and cannot be imported using this construct.
-tests/cases/compiler/main.ts(85,25): error TS2497: External module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
-tests/cases/compiler/main.ts(91,25): error TS2497: External module '"function"' resolves to a non-module entity and cannot be imported using this construct.
-tests/cases/compiler/main.ts(93,25): error TS2497: External module '"class"' resolves to a non-module entity and cannot be imported using this construct.
-tests/cases/compiler/main.ts(97,15): error TS2498: External module '"interface"' uses 'export =' and cannot be used with 'export *'.
-tests/cases/compiler/main.ts(98,15): error TS2498: External module '"variable"' uses 'export =' and cannot be used with 'export *'.
-tests/cases/compiler/main.ts(99,15): error TS2498: External module '"interface-variable"' uses 'export =' and cannot be used with 'export *'.
-tests/cases/compiler/main.ts(100,15): error TS2498: External module '"module"' uses 'export =' and cannot be used with 'export *'.
-tests/cases/compiler/main.ts(101,15): error TS2498: External module '"interface-module"' uses 'export =' and cannot be used with 'export *'.
-tests/cases/compiler/main.ts(102,15): error TS2498: External module '"variable-module"' uses 'export =' and cannot be used with 'export *'.
-tests/cases/compiler/main.ts(103,15): error TS2498: External module '"function"' uses 'export =' and cannot be used with 'export *'.
-tests/cases/compiler/main.ts(104,15): error TS2498: External module '"function-module"' uses 'export =' and cannot be used with 'export *'.
-tests/cases/compiler/main.ts(105,15): error TS2498: External module '"class"' uses 'export =' and cannot be used with 'export *'.
-tests/cases/compiler/main.ts(106,15): error TS2498: External module '"class-module"' uses 'export =' and cannot be used with 'export *'.
+tests/cases/compiler/main.ts(27,8): error TS1192: Module '"interface"' has no default export.
+tests/cases/compiler/main.ts(28,8): error TS1192: Module '"variable"' has no default export.
+tests/cases/compiler/main.ts(29,8): error TS1192: Module '"interface-variable"' has no default export.
+tests/cases/compiler/main.ts(30,8): error TS1192: Module '"module"' has no default export.
+tests/cases/compiler/main.ts(31,8): error TS1192: Module '"interface-module"' has no default export.
+tests/cases/compiler/main.ts(32,8): error TS1192: Module '"variable-module"' has no default export.
+tests/cases/compiler/main.ts(33,8): error TS1192: Module '"function"' has no default export.
+tests/cases/compiler/main.ts(34,8): error TS1192: Module '"function-module"' has no default export.
+tests/cases/compiler/main.ts(35,8): error TS1192: Module '"class"' has no default export.
+tests/cases/compiler/main.ts(36,8): error TS1192: Module '"class-module"' has no default export.
+tests/cases/compiler/main.ts(39,21): error TS2497: Module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
+tests/cases/compiler/main.ts(45,21): error TS2497: Module '"function"' resolves to a non-module entity and cannot be imported using this construct.
+tests/cases/compiler/main.ts(47,21): error TS2497: Module '"class"' resolves to a non-module entity and cannot be imported using this construct.
+tests/cases/compiler/main.ts(62,25): error TS2497: Module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
+tests/cases/compiler/main.ts(68,25): error TS2497: Module '"function"' resolves to a non-module entity and cannot be imported using this construct.
+tests/cases/compiler/main.ts(70,25): error TS2497: Module '"class"' resolves to a non-module entity and cannot be imported using this construct.
+tests/cases/compiler/main.ts(85,25): error TS2497: Module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
+tests/cases/compiler/main.ts(91,25): error TS2497: Module '"function"' resolves to a non-module entity and cannot be imported using this construct.
+tests/cases/compiler/main.ts(93,25): error TS2497: Module '"class"' resolves to a non-module entity and cannot be imported using this construct.
+tests/cases/compiler/main.ts(97,15): error TS2498: Module '"interface"' uses 'export =' and cannot be used with 'export *'.
+tests/cases/compiler/main.ts(98,15): error TS2498: Module '"variable"' uses 'export =' and cannot be used with 'export *'.
+tests/cases/compiler/main.ts(99,15): error TS2498: Module '"interface-variable"' uses 'export =' and cannot be used with 'export *'.
+tests/cases/compiler/main.ts(100,15): error TS2498: Module '"module"' uses 'export =' and cannot be used with 'export *'.
+tests/cases/compiler/main.ts(101,15): error TS2498: Module '"interface-module"' uses 'export =' and cannot be used with 'export *'.
+tests/cases/compiler/main.ts(102,15): error TS2498: Module '"variable-module"' uses 'export =' and cannot be used with 'export *'.
+tests/cases/compiler/main.ts(103,15): error TS2498: Module '"function"' uses 'export =' and cannot be used with 'export *'.
+tests/cases/compiler/main.ts(104,15): error TS2498: Module '"function-module"' uses 'export =' and cannot be used with 'export *'.
+tests/cases/compiler/main.ts(105,15): error TS2498: Module '"class"' uses 'export =' and cannot be used with 'export *'.
+tests/cases/compiler/main.ts(106,15): error TS2498: Module '"class-module"' uses 'export =' and cannot be used with 'export *'.
==== tests/cases/compiler/main.ts (32 errors) ====
@@ -67,39 +67,39 @@ tests/cases/compiler/main.ts(106,15): error TS2498: External module '"class-modu
// default import
import x1 from "interface";
~~
-!!! error TS1192: External module '"interface"' has no default export.
+!!! error TS1192: Module '"interface"' has no default export.
import x2 from "variable";
~~
-!!! error TS1192: External module '"variable"' has no default export.
+!!! error TS1192: Module '"variable"' has no default export.
import x3 from "interface-variable";
~~
-!!! error TS1192: External module '"interface-variable"' has no default export.
+!!! error TS1192: Module '"interface-variable"' has no default export.
import x4 from "module";
~~
-!!! error TS1192: External module '"module"' has no default export.
+!!! error TS1192: Module '"module"' has no default export.
import x5 from "interface-module";
~~
-!!! error TS1192: External module '"interface-module"' has no default export.
+!!! error TS1192: Module '"interface-module"' has no default export.
import x6 from "variable-module";
~~
-!!! error TS1192: External module '"variable-module"' has no default export.
+!!! error TS1192: Module '"variable-module"' has no default export.
import x7 from "function";
~~
-!!! error TS1192: External module '"function"' has no default export.
+!!! error TS1192: Module '"function"' has no default export.
import x8 from "function-module";
~~
-!!! error TS1192: External module '"function-module"' has no default export.
+!!! error TS1192: Module '"function-module"' has no default export.
import x9 from "class";
~~
-!!! error TS1192: External module '"class"' has no default export.
+!!! error TS1192: Module '"class"' has no default export.
import x0 from "class-module";
~~
-!!! error TS1192: External module '"class-module"' has no default export.
+!!! error TS1192: Module '"class-module"' has no default export.
// namespace import
import * as y1 from "interface";
~~~~~~~~~~~
-!!! error TS2497: External module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
+!!! error TS2497: Module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
import * as y2 from "variable";
import * as y3 from "interface-variable";
import * as y4 from "module";
@@ -107,11 +107,11 @@ tests/cases/compiler/main.ts(106,15): error TS2498: External module '"class-modu
import * as y6 from "variable-module";
import * as y7 from "function";
~~~~~~~~~~
-!!! error TS2497: External module '"function"' resolves to a non-module entity and cannot be imported using this construct.
+!!! error TS2497: Module '"function"' resolves to a non-module entity and cannot be imported using this construct.
import * as y8 from "function-module";
import * as y9 from "class";
~~~~~~~
-!!! error TS2497: External module '"class"' resolves to a non-module entity and cannot be imported using this construct.
+!!! error TS2497: Module '"class"' resolves to a non-module entity and cannot be imported using this construct.
import * as y0 from "class-module";
y1.a;
@@ -128,7 +128,7 @@ tests/cases/compiler/main.ts(106,15): error TS2498: External module '"class-modu
// named import
import { a as a1 } from "interface";
~~~~~~~~~~~
-!!! error TS2497: External module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
+!!! error TS2497: Module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
import { a as a2 } from "variable";
import { a as a3 } from "interface-variable";
import { a as a4 } from "module";
@@ -136,11 +136,11 @@ tests/cases/compiler/main.ts(106,15): error TS2498: External module '"class-modu
import { a as a6 } from "variable-module";
import { a as a7 } from "function";
~~~~~~~~~~
-!!! error TS2497: External module '"function"' resolves to a non-module entity and cannot be imported using this construct.
+!!! error TS2497: Module '"function"' resolves to a non-module entity and cannot be imported using this construct.
import { a as a8 } from "function-module";
import { a as a9 } from "class";
~~~~~~~
-!!! error TS2497: External module '"class"' resolves to a non-module entity and cannot be imported using this construct.
+!!! error TS2497: Module '"class"' resolves to a non-module entity and cannot be imported using this construct.
import { a as a0 } from "class-module";
a1;
@@ -157,7 +157,7 @@ tests/cases/compiler/main.ts(106,15): error TS2498: External module '"class-modu
// named export
export { a as a1 } from "interface";
~~~~~~~~~~~
-!!! error TS2497: External module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
+!!! error TS2497: Module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
export { a as a2 } from "variable";
export { a as a3 } from "interface-variable";
export { a as a4 } from "module";
@@ -165,44 +165,44 @@ tests/cases/compiler/main.ts(106,15): error TS2498: External module '"class-modu
export { a as a6 } from "variable-module";
export { a as a7 } from "function";
~~~~~~~~~~
-!!! error TS2497: External module '"function"' resolves to a non-module entity and cannot be imported using this construct.
+!!! error TS2497: Module '"function"' resolves to a non-module entity and cannot be imported using this construct.
export { a as a8 } from "function-module";
export { a as a9 } from "class";
~~~~~~~
-!!! error TS2497: External module '"class"' resolves to a non-module entity and cannot be imported using this construct.
+!!! error TS2497: Module '"class"' resolves to a non-module entity and cannot be imported using this construct.
export { a as a0 } from "class-module";
// export-star
export * from "interface";
~~~~~~~~~~~
-!!! error TS2498: External module '"interface"' uses 'export =' and cannot be used with 'export *'.
+!!! error TS2498: Module '"interface"' uses 'export =' and cannot be used with 'export *'.
export * from "variable";
~~~~~~~~~~
-!!! error TS2498: External module '"variable"' uses 'export =' and cannot be used with 'export *'.
+!!! error TS2498: Module '"variable"' uses 'export =' and cannot be used with 'export *'.
export * from "interface-variable";
~~~~~~~~~~~~~~~~~~~~
-!!! error TS2498: External module '"interface-variable"' uses 'export =' and cannot be used with 'export *'.
+!!! error TS2498: Module '"interface-variable"' uses 'export =' and cannot be used with 'export *'.
export * from "module";
~~~~~~~~
-!!! error TS2498: External module '"module"' uses 'export =' and cannot be used with 'export *'.
+!!! error TS2498: Module '"module"' uses 'export =' and cannot be used with 'export *'.
export * from "interface-module";
~~~~~~~~~~~~~~~~~~
-!!! error TS2498: External module '"interface-module"' uses 'export =' and cannot be used with 'export *'.
+!!! error TS2498: Module '"interface-module"' uses 'export =' and cannot be used with 'export *'.
export * from "variable-module";
~~~~~~~~~~~~~~~~~
-!!! error TS2498: External module '"variable-module"' uses 'export =' and cannot be used with 'export *'.
+!!! error TS2498: Module '"variable-module"' uses 'export =' and cannot be used with 'export *'.
export * from "function";
~~~~~~~~~~
-!!! error TS2498: External module '"function"' uses 'export =' and cannot be used with 'export *'.
+!!! error TS2498: Module '"function"' uses 'export =' and cannot be used with 'export *'.
export * from "function-module";
~~~~~~~~~~~~~~~~~
-!!! error TS2498: External module '"function-module"' uses 'export =' and cannot be used with 'export *'.
+!!! error TS2498: Module '"function-module"' uses 'export =' and cannot be used with 'export *'.
export * from "class";
~~~~~~~
-!!! error TS2498: External module '"class"' uses 'export =' and cannot be used with 'export *'.
+!!! error TS2498: Module '"class"' uses 'export =' and cannot be used with 'export *'.
export * from "class-module";
~~~~~~~~~~~~~~
-!!! error TS2498: External module '"class-module"' uses 'export =' and cannot be used with 'export *'.
+!!! error TS2498: Module '"class-module"' uses 'export =' and cannot be used with 'export *'.
==== tests/cases/compiler/modules.d.ts (0 errors) ====
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.errors.txt
index 5844f39ed3a..edaa0b81a5c 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.errors.txt
@@ -1,7 +1,7 @@
-error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
-!!! error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
==== tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport_0.ts (0 errors) ====
export var a = 10;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.errors.txt
index 409c50d3a3f..451543d78f5 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/compiler/client.ts(1,8): error TS1192: External module '"tests/cases/compiler/server"' has no default export.
-tests/cases/compiler/client.ts(2,8): error TS1192: External module '"tests/cases/compiler/server"' has no default export.
-tests/cases/compiler/client.ts(4,8): error TS1192: External module '"tests/cases/compiler/server"' has no default export.
-tests/cases/compiler/client.ts(6,8): error TS1192: External module '"tests/cases/compiler/server"' has no default export.
-tests/cases/compiler/client.ts(9,8): error TS1192: External module '"tests/cases/compiler/server"' has no default export.
-tests/cases/compiler/client.ts(11,8): error TS1192: External module '"tests/cases/compiler/server"' has no default export.
+tests/cases/compiler/client.ts(1,8): error TS1192: Module '"tests/cases/compiler/server"' has no default export.
+tests/cases/compiler/client.ts(2,8): error TS1192: Module '"tests/cases/compiler/server"' has no default export.
+tests/cases/compiler/client.ts(4,8): error TS1192: Module '"tests/cases/compiler/server"' has no default export.
+tests/cases/compiler/client.ts(6,8): error TS1192: Module '"tests/cases/compiler/server"' has no default export.
+tests/cases/compiler/client.ts(9,8): error TS1192: Module '"tests/cases/compiler/server"' has no default export.
+tests/cases/compiler/client.ts(11,8): error TS1192: Module '"tests/cases/compiler/server"' has no default export.
==== tests/cases/compiler/server.ts (0 errors) ====
@@ -18,26 +18,26 @@ tests/cases/compiler/client.ts(11,8): error TS1192: External module '"tests/case
==== tests/cases/compiler/client.ts (6 errors) ====
import defaultBinding1, { } from "server";
~~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/server"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/server"' has no default export.
import defaultBinding2, { a } from "server";
~~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/server"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/server"' has no default export.
export var x1 = new a();
import defaultBinding3, { a11 as b } from "server";
~~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/server"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/server"' has no default export.
export var x2 = new b();
import defaultBinding4, { x, a12 as y } from "server";
~~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/server"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/server"' has no default export.
export var x4 = new x();
export var x5 = new y();
import defaultBinding5, { x11 as z, } from "server";
~~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/server"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/server"' has no default export.
export var x3 = new z();
import defaultBinding6, { m, } from "server";
~~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/server"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/server"' has no default export.
export var x6 = new m();
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.errors.txt
index 502b1940576..c1c28416ec7 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts(1,8): error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
-tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts(2,8): error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
-tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts(4,8): error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
-tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts(6,8): error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
-tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts(9,8): error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
-tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts(11,8): error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
+tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts(1,8): error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
+tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts(2,8): error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
+tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts(4,8): error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
+tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts(6,8): error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
+tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts(9,8): error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
+tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts(11,8): error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
==== tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.ts (0 errors) ====
@@ -15,26 +15,26 @@ tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts(11
==== tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts (6 errors) ====
import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
~~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
~~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
var x1: number = a;
import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
~~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
var x1: number = b;
import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
~~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
var x1: number = x;
var x1: number = y;
import defaultBinding5, { x as z, } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
~~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
var x1: number = z;
import defaultBinding6, { m, } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
~~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
var x1: number = m;
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt
index ce7e8b1dc5d..eb28020ca9e 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts(1,8): error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding_0"' has no default export.
+tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts(1,8): error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding_0"' has no default export.
==== tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding_0.ts (0 errors) ====
@@ -8,5 +8,5 @@ tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts(1,
==== tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts (1 errors) ====
import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding_0"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding_0"' has no default export.
var x: number = nameSpaceBinding.a;
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.errors.txt
index 8af978d3bb6..19fa0383d52 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/client.ts(1,8): error TS1192: External module '"tests/cases/compiler/server"' has no default export.
+tests/cases/compiler/client.ts(1,8): error TS1192: Module '"tests/cases/compiler/server"' has no default export.
==== tests/cases/compiler/server.ts (0 errors) ====
@@ -8,5 +8,5 @@ tests/cases/compiler/client.ts(1,8): error TS1192: External module '"tests/cases
==== tests/cases/compiler/client.ts (1 errors) ====
import defaultBinding, * as nameSpaceBinding from "server";
~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/server"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/server"' has no default export.
export var x = new nameSpaceBinding.a();
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.errors.txt
index 48829f8e719..dbbbf67118e 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.ts(1,8): error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"' has no default export.
+tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.ts(1,8): error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"' has no default export.
==== tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.ts (0 errors) ====
@@ -8,5 +8,5 @@ tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.
==== tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.ts (1 errors) ====
import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0";
~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"' has no default export.
var x: number = nameSpaceBinding.a;
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.errors.txt
index 4730d493d8e..3da1cf3fda8 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.errors.txt
@@ -1,5 +1,5 @@
tests/cases/compiler/client.ts(1,1): error TS1191: An import declaration cannot have modifiers.
-tests/cases/compiler/client.ts(1,15): error TS1192: External module '"tests/cases/compiler/server"' has no default export.
+tests/cases/compiler/client.ts(1,15): error TS1192: Module '"tests/cases/compiler/server"' has no default export.
==== tests/cases/compiler/server.ts (0 errors) ====
@@ -11,5 +11,5 @@ tests/cases/compiler/client.ts(1,15): error TS1192: External module '"tests/case
~~~~~~
!!! error TS1191: An import declaration cannot have modifiers.
~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/server"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/server"' has no default export.
export var x: number = nameSpaceBinding.a;
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingInEs5.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingInEs5.errors.txt
index 5cccfd01094..109b322f4bb 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingInEs5.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingInEs5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/es6ImportDefaultBindingInEs5_1.ts(1,8): error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingInEs5_0"' has no default export.
+tests/cases/compiler/es6ImportDefaultBindingInEs5_1.ts(1,8): error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingInEs5_0"' has no default export.
==== tests/cases/compiler/es6ImportDefaultBindingInEs5_0.ts (0 errors) ====
@@ -9,4 +9,4 @@ tests/cases/compiler/es6ImportDefaultBindingInEs5_1.ts(1,8): error TS1192: Exter
==== tests/cases/compiler/es6ImportDefaultBindingInEs5_1.ts (1 errors) ====
import defaultBinding from "es6ImportDefaultBindingInEs5_0";
~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingInEs5_0"' has no default export.
\ No newline at end of file
+!!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingInEs5_0"' has no default export.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.errors.txt
index 43eaa16f639..a37a71e7378 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty_1.ts(1,8): error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty_0"' has no default export.
+tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty_1.ts(1,8): error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty_0"' has no default export.
==== tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty_0.ts (0 errors) ====
@@ -8,5 +8,5 @@ tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty_1.ts(1,8): error T
==== tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty_1.ts (1 errors) ====
import defaultBinding from "es6ImportDefaultBindingNoDefaultProperty_0";
~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty_0"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty_0"' has no default export.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.errors.txt b/tests/baselines/reference/es6ImportNameSpaceImport.errors.txt
index 20b74ee394e..cd822712cd5 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImport.errors.txt
+++ b/tests/baselines/reference/es6ImportNameSpaceImport.errors.txt
@@ -1,7 +1,7 @@
-error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
-!!! error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
==== tests/cases/compiler/es6ImportNameSpaceImport_0.ts (0 errors) ====
export var a = 10;
diff --git a/tests/baselines/reference/es6ImportNamedImport.errors.txt b/tests/baselines/reference/es6ImportNamedImport.errors.txt
index b20f3808c95..2791c382d45 100644
--- a/tests/baselines/reference/es6ImportNamedImport.errors.txt
+++ b/tests/baselines/reference/es6ImportNamedImport.errors.txt
@@ -1,7 +1,7 @@
-error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
-!!! error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
==== tests/cases/compiler/es6ImportNamedImport_0.ts (0 errors) ====
export var a = 10;
diff --git a/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.errors.txt b/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.errors.txt
index bba30908b01..cb0a5caff8d 100644
--- a/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.errors.txt
+++ b/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.errors.txt
@@ -1,16 +1,16 @@
tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(2,10): error TS2300: Duplicate identifier 'yield'.
-tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(2,23): error TS2307: Cannot find external module 'somemodule'.
+tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(2,23): error TS2307: Cannot find module 'somemodule'.
tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(3,10): error TS1003: Identifier expected.
tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(3,10): error TS2300: Duplicate identifier 'default'.
-tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(3,25): error TS2307: Cannot find external module 'somemodule'.
+tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(3,25): error TS2307: Cannot find module 'somemodule'.
tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(4,19): error TS1003: Identifier expected.
tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(4,19): error TS2300: Duplicate identifier 'default'.
-tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(4,34): error TS2307: Cannot find external module 'somemodule'.
+tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(4,34): error TS2307: Cannot find module 'somemodule'.
tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(5,21): error TS2300: Duplicate identifier 'yield'.
-tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(5,34): error TS2307: Cannot find external module 'somemodule'.
+tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(5,34): error TS2307: Cannot find module 'somemodule'.
tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(6,21): error TS1003: Identifier expected.
tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(6,21): error TS2300: Duplicate identifier 'default'.
-tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(6,36): error TS2307: Cannot find external module 'somemodule'.
+tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(6,36): error TS2307: Cannot find module 'somemodule'.
==== tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts (13 errors) ====
@@ -19,30 +19,30 @@ tests/cases/compiler/es6ImportNamedImportIdentifiersParsing.ts(6,36): error TS23
~~~~~
!!! error TS2300: Duplicate identifier 'yield'.
~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'somemodule'.
+!!! error TS2307: Cannot find module 'somemodule'.
import { default } from "somemodule"; // Error - as this is keyword that is not allowed as identifier
~~~~~~~
!!! error TS1003: Identifier expected.
~~~~~~~
!!! error TS2300: Duplicate identifier 'default'.
~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'somemodule'.
+!!! error TS2307: Cannot find module 'somemodule'.
import { yield as default } from "somemodule"; // error to use default as binding name
~~~~~~~
!!! error TS1003: Identifier expected.
~~~~~~~
!!! error TS2300: Duplicate identifier 'default'.
~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'somemodule'.
+!!! error TS2307: Cannot find module 'somemodule'.
import { default as yield } from "somemodule"; // no error
~~~~~
!!! error TS2300: Duplicate identifier 'yield'.
~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'somemodule'.
+!!! error TS2307: Cannot find module 'somemodule'.
import { default as default } from "somemodule"; // default as is ok, error of default binding name
~~~~~~~
!!! error TS1003: Identifier expected.
~~~~~~~
!!! error TS2300: Duplicate identifier 'default'.
~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'somemodule'.
\ No newline at end of file
+!!! error TS2307: Cannot find module 'somemodule'.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.errors.txt b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.errors.txt
index ce4d4965921..6559fbe6104 100644
--- a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.errors.txt
+++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.errors.txt
@@ -1,8 +1,8 @@
-error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
tests/cases/compiler/es6ImportNamedImportInExportAssignment_1.ts(2,1): error TS1203: Export assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'export default' instead.
-!!! error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
==== tests/cases/compiler/es6ImportNamedImportInExportAssignment_0.ts (0 errors) ====
export var a = 10;
diff --git a/tests/baselines/reference/es6ImportNamedImportParsingError.errors.txt b/tests/baselines/reference/es6ImportNamedImportParsingError.errors.txt
index c9586d01693..585cc51fb92 100644
--- a/tests/baselines/reference/es6ImportNamedImportParsingError.errors.txt
+++ b/tests/baselines/reference/es6ImportNamedImportParsingError.errors.txt
@@ -3,7 +3,7 @@ tests/cases/compiler/es6ImportNamedImportParsingError_1.ts(1,10): error TS1141:
tests/cases/compiler/es6ImportNamedImportParsingError_1.ts(1,12): error TS1109: Expression expected.
tests/cases/compiler/es6ImportNamedImportParsingError_1.ts(1,14): error TS2304: Cannot find name 'from'.
tests/cases/compiler/es6ImportNamedImportParsingError_1.ts(1,19): error TS1005: ';' expected.
-tests/cases/compiler/es6ImportNamedImportParsingError_1.ts(2,8): error TS1192: External module '"tests/cases/compiler/es6ImportNamedImportParsingError_0"' has no default export.
+tests/cases/compiler/es6ImportNamedImportParsingError_1.ts(2,8): error TS1192: Module '"tests/cases/compiler/es6ImportNamedImportParsingError_0"' has no default export.
tests/cases/compiler/es6ImportNamedImportParsingError_1.ts(2,24): error TS1005: '{' expected.
tests/cases/compiler/es6ImportNamedImportParsingError_1.ts(3,1): error TS1128: Declaration or statement expected.
tests/cases/compiler/es6ImportNamedImportParsingError_1.ts(3,8): error TS1128: Declaration or statement expected.
@@ -34,7 +34,7 @@ tests/cases/compiler/es6ImportNamedImportParsingError_1.ts(4,20): error TS1005:
!!! error TS1005: ';' expected.
import defaultBinding, from "es6ImportNamedImportParsingError_0";
~~~~~~~~~~~~~~
-!!! error TS1192: External module '"tests/cases/compiler/es6ImportNamedImportParsingError_0"' has no default export.
+!!! error TS1192: Module '"tests/cases/compiler/es6ImportNamedImportParsingError_0"' has no default export.
~~~~
!!! error TS1005: '{' expected.
import , { a } from "es6ImportNamedImportParsingError_0";
diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports.errors.txt b/tests/baselines/reference/es6ModuleInternalNamedImports.errors.txt
index 4e097ec1a33..fb49f08e2e0 100644
--- a/tests/baselines/reference/es6ModuleInternalNamedImports.errors.txt
+++ b/tests/baselines/reference/es6ModuleInternalNamedImports.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/es6ModuleInternalNamedImports.ts(23,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es6ModuleInternalNamedImports.ts(24,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es6ModuleInternalNamedImports.ts(25,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es6ModuleInternalNamedImports.ts(26,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es6ModuleInternalNamedImports.ts(27,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es6ModuleInternalNamedImports.ts(28,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es6ModuleInternalNamedImports.ts(29,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es6ModuleInternalNamedImports.ts(30,5): error TS1194: Export declarations are not permitted in an internal module.
+tests/cases/compiler/es6ModuleInternalNamedImports.ts(23,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es6ModuleInternalNamedImports.ts(24,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es6ModuleInternalNamedImports.ts(25,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es6ModuleInternalNamedImports.ts(26,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es6ModuleInternalNamedImports.ts(27,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es6ModuleInternalNamedImports.ts(28,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es6ModuleInternalNamedImports.ts(29,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es6ModuleInternalNamedImports.ts(30,5): error TS1194: Export declarations are not permitted in a namespace.
==== tests/cases/compiler/es6ModuleInternalNamedImports.ts (8 errors) ====
@@ -33,27 +33,27 @@ tests/cases/compiler/es6ModuleInternalNamedImports.ts(30,5): error TS1194: Expor
// Reexports
export {M_V as v};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_I as i};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_C as c};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_M as m};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_MU as mu};
~~~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_F as f};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_E as e};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_A as a};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports2.errors.txt b/tests/baselines/reference/es6ModuleInternalNamedImports2.errors.txt
index 77ee76cf9c8..af8de2d7fe2 100644
--- a/tests/baselines/reference/es6ModuleInternalNamedImports2.errors.txt
+++ b/tests/baselines/reference/es6ModuleInternalNamedImports2.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/es6ModuleInternalNamedImports2.ts(25,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es6ModuleInternalNamedImports2.ts(26,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es6ModuleInternalNamedImports2.ts(27,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es6ModuleInternalNamedImports2.ts(28,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es6ModuleInternalNamedImports2.ts(29,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es6ModuleInternalNamedImports2.ts(30,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es6ModuleInternalNamedImports2.ts(31,5): error TS1194: Export declarations are not permitted in an internal module.
-tests/cases/compiler/es6ModuleInternalNamedImports2.ts(32,5): error TS1194: Export declarations are not permitted in an internal module.
+tests/cases/compiler/es6ModuleInternalNamedImports2.ts(25,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es6ModuleInternalNamedImports2.ts(26,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es6ModuleInternalNamedImports2.ts(27,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es6ModuleInternalNamedImports2.ts(28,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es6ModuleInternalNamedImports2.ts(29,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es6ModuleInternalNamedImports2.ts(30,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es6ModuleInternalNamedImports2.ts(31,5): error TS1194: Export declarations are not permitted in a namespace.
+tests/cases/compiler/es6ModuleInternalNamedImports2.ts(32,5): error TS1194: Export declarations are not permitted in a namespace.
==== tests/cases/compiler/es6ModuleInternalNamedImports2.ts (8 errors) ====
@@ -35,27 +35,27 @@ tests/cases/compiler/es6ModuleInternalNamedImports2.ts(32,5): error TS1194: Expo
// Reexports
export {M_V as v};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_I as i};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_C as c};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_M as m};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_MU as mu};
~~~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_F as f};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_E as e};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
export {M_A as a};
~~~~~~~~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.errors.txt b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.errors.txt
index e851817ee8e..2dd610b57bf 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.errors.txt
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.errors.txt
@@ -1,7 +1,7 @@
-error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
-!!! error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
==== tests/cases/compiler/es6ModuleWithModuleGenTargetAmd.ts (0 errors) ====
export class A
{
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.errors.txt b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.errors.txt
index 1de27c03c54..e039e29064e 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.errors.txt
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.errors.txt
@@ -1,7 +1,7 @@
-error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
-!!! error TS1204: Cannot compile external modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
+!!! error TS1204: Cannot compile modules into 'amd', 'commonjs' or 'umd' when targeting 'ES6' or higher.
==== tests/cases/compiler/es6ModuleWithModuleGenTargetCommonjs.ts (0 errors) ====
export class A
{
diff --git a/tests/baselines/reference/exportAssignDottedName.errors.txt b/tests/baselines/reference/exportAssignDottedName.errors.txt
index a63a62fccbe..39a0a2577ee 100644
--- a/tests/baselines/reference/exportAssignDottedName.errors.txt
+++ b/tests/baselines/reference/exportAssignDottedName.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/externalModules/foo1.ts(1,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/externalModules/foo1.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ====
@@ -8,7 +8,7 @@ tests/cases/conformance/externalModules/foo1.ts(1,17): error TS1148: Cannot comp
==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ====
export function x(){
~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
return true;
}
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.errors.txt b/tests/baselines/reference/exportAssignImportedIdentifier.errors.txt
index a3e4702f1e6..753bc567619 100644
--- a/tests/baselines/reference/exportAssignImportedIdentifier.errors.txt
+++ b/tests/baselines/reference/exportAssignImportedIdentifier.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/externalModules/foo1.ts(1,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/externalModules/foo1.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/externalModules/foo3.ts (0 errors) ====
@@ -7,7 +7,7 @@ tests/cases/conformance/externalModules/foo1.ts(1,17): error TS1148: Cannot comp
==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ====
export function x(){
~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
return true;
}
diff --git a/tests/baselines/reference/exportAssignNonIdentifier.errors.txt b/tests/baselines/reference/exportAssignNonIdentifier.errors.txt
index 2935308909b..09e86ec12c4 100644
--- a/tests/baselines/reference/exportAssignNonIdentifier.errors.txt
+++ b/tests/baselines/reference/exportAssignNonIdentifier.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/externalModules/foo1.ts(2,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/externalModules/foo1.ts(2,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/externalModules/foo3.ts(1,16): error TS9003: 'class' expressions are not currently supported.
tests/cases/conformance/externalModules/foo6.ts(1,14): error TS1109: Expression expected.
@@ -7,7 +7,7 @@ tests/cases/conformance/externalModules/foo6.ts(1,14): error TS1109: Expression
var x = 10;
export = typeof x; // Ok
~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ====
export = "sausages"; // Ok
diff --git a/tests/baselines/reference/exportAssignTypes.errors.txt b/tests/baselines/reference/exportAssignTypes.errors.txt
index c35e7c0b8f6..ba5538777c5 100644
--- a/tests/baselines/reference/exportAssignTypes.errors.txt
+++ b/tests/baselines/reference/exportAssignTypes.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/externalModules/expString.ts(2,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/externalModules/expString.ts(2,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/externalModules/consumer.ts (0 errors) ====
@@ -27,7 +27,7 @@ tests/cases/conformance/externalModules/expString.ts(2,1): error TS1148: Cannot
var x = "test";
export = x;
~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/externalModules/expNumber.ts (0 errors) ====
var x = 42;
diff --git a/tests/baselines/reference/exportDeclaredModule.errors.txt b/tests/baselines/reference/exportDeclaredModule.errors.txt
index 265061fe2f4..47ee543e0c0 100644
--- a/tests/baselines/reference/exportDeclaredModule.errors.txt
+++ b/tests/baselines/reference/exportDeclaredModule.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/externalModules/foo1.ts(6,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/externalModules/foo1.ts(6,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ====
@@ -12,5 +12,5 @@ tests/cases/conformance/externalModules/foo1.ts(6,1): error TS1148: Cannot compi
}
export = M1;
~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/exportNonVisibleType.errors.txt b/tests/baselines/reference/exportNonVisibleType.errors.txt
index 0eb73b2b04e..04c174b4994 100644
--- a/tests/baselines/reference/exportNonVisibleType.errors.txt
+++ b/tests/baselines/reference/exportNonVisibleType.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/externalModules/foo1.ts(7,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/externalModules/foo1.ts(7,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/externalModules/foo1.ts(7,1): error TS1148: Cannot compi
var x: I1 = {a: "test", b: 42};
export = x; // Should fail, I1 not exported.
~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ====
diff --git a/tests/baselines/reference/exportStar-amd.errors.txt b/tests/baselines/reference/exportStar-amd.errors.txt
index 87e4c4740a0..adab0516103 100644
--- a/tests/baselines/reference/exportStar-amd.errors.txt
+++ b/tests/baselines/reference/exportStar-amd.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/modules/main.ts(1,8): error TS1192: External module '"tests/cases/conformance/es6/modules/t4"' has no default export.
+tests/cases/conformance/es6/modules/main.ts(1,8): error TS1192: Module '"tests/cases/conformance/es6/modules/t4"' has no default export.
==== tests/cases/conformance/es6/modules/t1.ts (0 errors) ====
@@ -24,7 +24,7 @@ tests/cases/conformance/es6/modules/main.ts(1,8): error TS1192: External module
==== tests/cases/conformance/es6/modules/main.ts (1 errors) ====
import hello, { x, y, z, foo } from "./t4";
~~~~~
-!!! error TS1192: External module '"tests/cases/conformance/es6/modules/t4"' has no default export.
+!!! error TS1192: Module '"tests/cases/conformance/es6/modules/t4"' has no default export.
hello;
x;
y;
diff --git a/tests/baselines/reference/exportStar.errors.txt b/tests/baselines/reference/exportStar.errors.txt
index 87e4c4740a0..adab0516103 100644
--- a/tests/baselines/reference/exportStar.errors.txt
+++ b/tests/baselines/reference/exportStar.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/modules/main.ts(1,8): error TS1192: External module '"tests/cases/conformance/es6/modules/t4"' has no default export.
+tests/cases/conformance/es6/modules/main.ts(1,8): error TS1192: Module '"tests/cases/conformance/es6/modules/t4"' has no default export.
==== tests/cases/conformance/es6/modules/t1.ts (0 errors) ====
@@ -24,7 +24,7 @@ tests/cases/conformance/es6/modules/main.ts(1,8): error TS1192: External module
==== tests/cases/conformance/es6/modules/main.ts (1 errors) ====
import hello, { x, y, z, foo } from "./t4";
~~~~~
-!!! error TS1192: External module '"tests/cases/conformance/es6/modules/t4"' has no default export.
+!!! error TS1192: Module '"tests/cases/conformance/es6/modules/t4"' has no default export.
hello;
x;
y;
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.errors.txt b/tests/baselines/reference/exportStarFromEmptyModule.errors.txt
index 598eb8bc029..c88ac3b3f19 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.errors.txt
+++ b/tests/baselines/reference/exportStarFromEmptyModule.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/exportStarFromEmptyModule_module3.ts(1,15): error TS2306: File 'tests/cases/compiler/exportStarFromEmptyModule_module2.ts' is not an external module.
+tests/cases/compiler/exportStarFromEmptyModule_module3.ts(1,15): error TS2306: File 'tests/cases/compiler/exportStarFromEmptyModule_module2.ts' is not a module.
tests/cases/compiler/exportStarFromEmptyModule_module4.ts(4,5): error TS2339: Property 'r' does not exist on type 'typeof A'.
@@ -14,7 +14,7 @@ tests/cases/compiler/exportStarFromEmptyModule_module4.ts(4,5): error TS2339: Pr
==== tests/cases/compiler/exportStarFromEmptyModule_module3.ts (1 errors) ====
export * from "exportStarFromEmptyModule_module2";
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2306: File 'exportStarFromEmptyModule_module2.ts' is not an external module.
+!!! error TS2306: File 'exportStarFromEmptyModule_module2.ts' is not a module.
export * from "exportStarFromEmptyModule_module1";
export class A {
diff --git a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.errors.txt b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.errors.txt
index f061276aa1a..64874c767ee 100644
--- a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.errors.txt
+++ b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts(3,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts (1 errors) ====
@@ -6,5 +6,5 @@ tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts(3,17): error TS1148:
// Not on line 0 because we want to verify the error is placed in the appropriate location.
export module M {
~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/funduleSplitAcrossFiles.errors.txt b/tests/baselines/reference/funduleSplitAcrossFiles.errors.txt
index 1fc68fff709..02aa57937ba 100644
--- a/tests/baselines/reference/funduleSplitAcrossFiles.errors.txt
+++ b/tests/baselines/reference/funduleSplitAcrossFiles.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/funduleSplitAcrossFiles_module.ts(1,8): error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
+tests/cases/compiler/funduleSplitAcrossFiles_module.ts(1,8): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
==== tests/cases/compiler/funduleSplitAcrossFiles_function.ts (0 errors) ====
@@ -7,7 +7,7 @@ tests/cases/compiler/funduleSplitAcrossFiles_module.ts(1,8): error TS2433: A mod
==== tests/cases/compiler/funduleSplitAcrossFiles_module.ts (1 errors) ====
module D {
~
-!!! error TS2433: A module declaration cannot be in a different file from a class or function with which it is merged
+!!! error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged
export var y = "hi";
}
D.y;
\ No newline at end of file
diff --git a/tests/baselines/reference/genericArrayExtenstions.errors.txt b/tests/baselines/reference/genericArrayExtenstions.errors.txt
index e3004eb2838..f3035497910 100644
--- a/tests/baselines/reference/genericArrayExtenstions.errors.txt
+++ b/tests/baselines/reference/genericArrayExtenstions.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/genericArrayExtenstions.ts(1,22): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/compiler/genericArrayExtenstions.ts(1,22): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/compiler/genericArrayExtenstions.ts(1,22): error TS2420: Class 'ObservableArray' incorrectly implements interface 'T[]'.
Property 'length' is missing in type 'ObservableArray'.
@@ -6,7 +6,7 @@ tests/cases/compiler/genericArrayExtenstions.ts(1,22): error TS2420: Class 'Obse
==== tests/cases/compiler/genericArrayExtenstions.ts (2 errors) ====
export declare class ObservableArray implements Array { // MS.Entertainment.ObservableArray
~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
~~~~~~~~~~~~~~~
!!! error TS2420: Class 'ObservableArray' incorrectly implements interface 'T[]'.
!!! error TS2420: Property 'length' is missing in type 'ObservableArray'.
diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.errors.txt b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.errors.txt
index abd9ee65196..d12854648e5 100644
--- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.errors.txt
+++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file0.ts(1,15): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file0.ts(1,15): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file1.ts (0 errors) ====
@@ -12,7 +12,7 @@ tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file0.ts(
==== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file0.ts (1 errors) ====
export module m {
~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
export function foo() { }
}
\ No newline at end of file
diff --git a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.errors.txt b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.errors.txt
index 7603a694348..e46ff8bea13 100644
--- a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.errors.txt
+++ b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.errors.txt
@@ -1,20 +1,20 @@
-tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
-tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(1,20): error TS2307: Cannot find external module 'externalModule'.
-tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(2,16): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(3,26): error TS2307: Cannot find external module 'externalModule'.
+tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
+tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(1,20): error TS2307: Cannot find module 'externalModule'.
+tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(2,16): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(3,26): error TS2307: Cannot find module 'externalModule'.
==== tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts (4 errors) ====
import b = require("externalModule");
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'externalModule'.
+!!! error TS2307: Cannot find module 'externalModule'.
declare module "m1" {
~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
import im2 = require("externalModule");
~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'externalModule'.
+!!! error TS2307: Cannot find module 'externalModule'.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt b/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt
index 56da8354977..13991aea7f7 100644
--- a/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt
+++ b/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/importDeclWithDeclareModifier.ts(5,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/compiler/importDeclWithDeclareModifier.ts(5,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/compiler/importDeclWithDeclareModifier.ts(5,9): error TS1029: 'export' modifier must precede 'declare' modifier.
tests/cases/compiler/importDeclWithDeclareModifier.ts(5,29): error TS2305: Module 'x' has no exported member 'c'.
@@ -10,7 +10,7 @@ tests/cases/compiler/importDeclWithDeclareModifier.ts(5,29): error TS2305: Modul
}
declare export import a = x.c;
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
~~~~~~
!!! error TS1029: 'export' modifier must precede 'declare' modifier.
~
diff --git a/tests/baselines/reference/importDeclarationInModuleDeclaration1.errors.txt b/tests/baselines/reference/importDeclarationInModuleDeclaration1.errors.txt
index e8e9de076ad..1f31509147f 100644
--- a/tests/baselines/reference/importDeclarationInModuleDeclaration1.errors.txt
+++ b/tests/baselines/reference/importDeclarationInModuleDeclaration1.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/compiler/importDeclarationInModuleDeclaration1.ts(2,25): error TS1147: Import declarations in an internal module cannot reference an external module.
+tests/cases/compiler/importDeclarationInModuleDeclaration1.ts(2,25): error TS1147: Import declarations in a namespace cannot reference a module.
==== tests/cases/compiler/importDeclarationInModuleDeclaration1.ts (1 errors) ====
module m2 {
import m3 = require("use_glo_M1_public");
~~~~~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/importInsideModule.errors.txt b/tests/baselines/reference/importInsideModule.errors.txt
index efe9b78125f..fcf82bd2494 100644
--- a/tests/baselines/reference/importInsideModule.errors.txt
+++ b/tests/baselines/reference/importInsideModule.errors.txt
@@ -1,14 +1,14 @@
-tests/cases/compiler/importInsideModule_file2.ts(2,26): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/importInsideModule_file2.ts(2,26): error TS2307: Cannot find external module 'importInsideModule_file1'.
+tests/cases/compiler/importInsideModule_file2.ts(2,26): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/importInsideModule_file2.ts(2,26): error TS2307: Cannot find module 'importInsideModule_file1'.
==== tests/cases/compiler/importInsideModule_file2.ts (2 errors) ====
export module myModule {
import foo = require("importInsideModule_file1");
~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'importInsideModule_file1'.
+!!! error TS2307: Cannot find module 'importInsideModule_file1'.
var a = foo.x;
}
==== tests/cases/compiler/importInsideModule_file1.ts (0 errors) ====
diff --git a/tests/baselines/reference/importNonExternalModule.errors.txt b/tests/baselines/reference/importNonExternalModule.errors.txt
index bce2c86d0f0..fb8294c5c03 100644
--- a/tests/baselines/reference/importNonExternalModule.errors.txt
+++ b/tests/baselines/reference/importNonExternalModule.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/externalModules/foo_1.ts(1,22): error TS2306: File 'tests/cases/conformance/externalModules/foo_0.ts' is not an external module.
+tests/cases/conformance/externalModules/foo_1.ts(1,22): error TS2306: File 'tests/cases/conformance/externalModules/foo_0.ts' is not a module.
==== tests/cases/conformance/externalModules/foo_1.ts (1 errors) ====
import foo = require("./foo_0");
~~~~~~~~~
-!!! error TS2306: File 'foo_0.ts' is not an external module.
+!!! error TS2306: File 'foo_0.ts' is not a module.
// Import should fail. foo_0 not an external module
if(foo.answer === 42){
diff --git a/tests/baselines/reference/invalidNestedModules.errors.txt b/tests/baselines/reference/invalidNestedModules.errors.txt
index 972c177fc0e..1f9551a0f0b 100644
--- a/tests/baselines/reference/invalidNestedModules.errors.txt
+++ b/tests/baselines/reference/invalidNestedModules.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/internalModules/moduleDeclarations/invalidNestedModules.ts(1,12): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+tests/cases/conformance/internalModules/moduleDeclarations/invalidNestedModules.ts(1,12): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
tests/cases/conformance/internalModules/moduleDeclarations/invalidNestedModules.ts(17,18): error TS2300: Duplicate identifier 'Point'.
tests/cases/conformance/internalModules/moduleDeclarations/invalidNestedModules.ts(24,20): error TS2300: Duplicate identifier 'Point'.
@@ -6,7 +6,7 @@ tests/cases/conformance/internalModules/moduleDeclarations/invalidNestedModules.
==== tests/cases/conformance/internalModules/moduleDeclarations/invalidNestedModules.ts (3 errors) ====
module A.B.C {
~
-!!! error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
export class Point {
x: number;
y: number;
diff --git a/tests/baselines/reference/lambdaPropSelf.errors.txt b/tests/baselines/reference/lambdaPropSelf.errors.txt
index ffdbc006423..e0311c364cd 100644
--- a/tests/baselines/reference/lambdaPropSelf.errors.txt
+++ b/tests/baselines/reference/lambdaPropSelf.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/lambdaPropSelf.ts(21,13): error TS2331: 'this' cannot be referenced in a module body.
+tests/cases/compiler/lambdaPropSelf.ts(21,13): error TS2331: 'this' cannot be referenced in a module or namespace body.
==== tests/cases/compiler/lambdaPropSelf.ts (1 errors) ====
@@ -24,6 +24,6 @@ tests/cases/compiler/lambdaPropSelf.ts(21,13): error TS2331: 'this' cannot be re
module M {
var x = this;
~~~~
-!!! error TS2331: 'this' cannot be referenced in a module body.
+!!! error TS2331: 'this' cannot be referenced in a module or namespace body.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.errors.txt b/tests/baselines/reference/mergedModuleDeclarationCodeGen.errors.txt
index 25000ce2f5c..d9b7fa55d71 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.errors.txt
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/compiler/mergedModuleDeclarationCodeGen.ts(1,15): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/compiler/mergedModuleDeclarationCodeGen.ts(1,15): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/compiler/mergedModuleDeclarationCodeGen.ts (1 errors) ====
export module X {
~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
export module Y {
class A {
constructor(Y: any) {
diff --git a/tests/baselines/reference/moduleScoping.errors.txt b/tests/baselines/reference/moduleScoping.errors.txt
index 1468d3e33bf..21471bc93a5 100644
--- a/tests/baselines/reference/moduleScoping.errors.txt
+++ b/tests/baselines/reference/moduleScoping.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/externalModules/file3.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/externalModules/file3.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/externalModules/file1.ts (0 errors) ====
@@ -11,7 +11,7 @@ tests/cases/conformance/externalModules/file3.ts(1,1): error TS1148: Cannot comp
==== tests/cases/conformance/externalModules/file3.ts (1 errors) ====
export var v3 = true;
~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
var v2 = [1,2,3]; // Module scope. Should not appear in global scope
==== tests/cases/conformance/externalModules/file4.ts (0 errors) ====
diff --git a/tests/baselines/reference/multipleExports.errors.txt b/tests/baselines/reference/multipleExports.errors.txt
index 254717843cf..430b8618daf 100644
--- a/tests/baselines/reference/multipleExports.errors.txt
+++ b/tests/baselines/reference/multipleExports.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/multipleExports.ts(10,5): error TS1194: Export declarations are not permitted in an internal module.
+tests/cases/compiler/multipleExports.ts(10,5): error TS1194: Export declarations are not permitted in a namespace.
tests/cases/compiler/multipleExports.ts(10,13): error TS2484: Export declaration conflicts with exported declaration of 'x'
@@ -14,7 +14,7 @@ tests/cases/compiler/multipleExports.ts(10,13): error TS2484: Export declaration
v;
export {x};
~~~~~~~~~~~
-!!! error TS1194: Export declarations are not permitted in an internal module.
+!!! error TS1194: Export declarations are not permitted in a namespace.
~
!!! error TS2484: Export declaration conflicts with exported declaration of 'x'
}
diff --git a/tests/baselines/reference/nameCollisions.errors.txt b/tests/baselines/reference/nameCollisions.errors.txt
index baa7c6cbfd5..5eb7ea2cf80 100644
--- a/tests/baselines/reference/nameCollisions.errors.txt
+++ b/tests/baselines/reference/nameCollisions.errors.txt
@@ -2,7 +2,7 @@ tests/cases/compiler/nameCollisions.ts(2,9): error TS2300: Duplicate identifier
tests/cases/compiler/nameCollisions.ts(4,12): error TS2300: Duplicate identifier 'x'.
tests/cases/compiler/nameCollisions.ts(10,12): error TS2300: Duplicate identifier 'z'.
tests/cases/compiler/nameCollisions.ts(13,9): error TS2300: Duplicate identifier 'z'.
-tests/cases/compiler/nameCollisions.ts(15,12): error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+tests/cases/compiler/nameCollisions.ts(15,12): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
tests/cases/compiler/nameCollisions.ts(24,9): error TS2300: Duplicate identifier 'f'.
tests/cases/compiler/nameCollisions.ts(25,14): error TS2300: Duplicate identifier 'f'.
tests/cases/compiler/nameCollisions.ts(27,14): error TS2300: Duplicate identifier 'f2'.
@@ -42,7 +42,7 @@ tests/cases/compiler/nameCollisions.ts(46,11): error TS2300: Duplicate identifie
module y {
~
-!!! error TS2434: A module declaration cannot be located prior to a class or function with which it is merged
+!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
var b;
}
diff --git a/tests/baselines/reference/nameWithFileExtension.errors.txt b/tests/baselines/reference/nameWithFileExtension.errors.txt
index ed4a1165e7e..2aa341271cd 100644
--- a/tests/baselines/reference/nameWithFileExtension.errors.txt
+++ b/tests/baselines/reference/nameWithFileExtension.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/externalModules/foo_1.ts(1,22): error TS2307: Cannot find external module './foo_0.js'.
+tests/cases/conformance/externalModules/foo_1.ts(1,22): error TS2307: Cannot find module './foo_0.js'.
==== tests/cases/conformance/externalModules/foo_1.ts (1 errors) ====
import foo = require('./foo_0.js');
~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module './foo_0.js'.
+!!! error TS2307: Cannot find module './foo_0.js'.
var x = foo.foo + 42;
==== tests/cases/conformance/externalModules/foo_0.ts (0 errors) ====
diff --git a/tests/baselines/reference/parser0_004152.errors.txt b/tests/baselines/reference/parser0_004152.errors.txt
index 43a8945ffea..97527418337 100644
--- a/tests/baselines/reference/parser0_004152.errors.txt
+++ b/tests/baselines/reference/parser0_004152.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(1,14): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,28): error TS2304: Cannot find name 'DisplayPosition'.
tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,45): error TS1137: Expression or comma expected.
tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,46): error TS1005: ';' expected.
@@ -38,7 +38,7 @@ tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(3,25): error T
==== tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts (35 errors) ====
export class Game {
~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
private position = new DisplayPosition([), 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0], NoMove, 0);
~~~~~~~~~~~~~~~
!!! error TS2304: Cannot find name 'DisplayPosition'.
diff --git a/tests/baselines/reference/parser509546.errors.txt b/tests/baselines/reference/parser509546.errors.txt
index ad8bf69dc12..6b98dc2aa30 100644
--- a/tests/baselines/reference/parser509546.errors.txt
+++ b/tests/baselines/reference/parser509546.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546.ts(1,14): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546.ts (1 errors) ====
export class Logger {
~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
public
}
\ No newline at end of file
diff --git a/tests/baselines/reference/parser509546_1.errors.txt b/tests/baselines/reference/parser509546_1.errors.txt
index 2620036c5b6..5987aadff24 100644
--- a/tests/baselines/reference/parser509546_1.errors.txt
+++ b/tests/baselines/reference/parser509546_1.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_1.ts(1,14): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_1.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_1.ts (1 errors) ====
export class Logger {
~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
public
}
\ No newline at end of file
diff --git a/tests/baselines/reference/parser509546_2.errors.txt b/tests/baselines/reference/parser509546_2.errors.txt
index f945ccaac00..617fec94321 100644
--- a/tests/baselines/reference/parser509546_2.errors.txt
+++ b/tests/baselines/reference/parser509546_2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts(3,14): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts(3,14): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts (1 errors) ====
@@ -6,7 +6,7 @@ tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts(3,1
export class Logger {
~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
public
}
\ No newline at end of file
diff --git a/tests/baselines/reference/parser618973.errors.txt b/tests/baselines/reference/parser618973.errors.txt
index 83cbfb3eb67..95e08726661 100644
--- a/tests/baselines/reference/parser618973.errors.txt
+++ b/tests/baselines/reference/parser618973.errors.txt
@@ -1,5 +1,5 @@
tests/cases/conformance/parser/ecmascript5/RegressionTests/parser618973.ts(1,8): error TS1030: 'export' modifier already seen.
-tests/cases/conformance/parser/ecmascript5/RegressionTests/parser618973.ts(1,21): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/RegressionTests/parser618973.ts(1,21): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser618973.ts (2 errors) ====
@@ -7,7 +7,7 @@ tests/cases/conformance/parser/ecmascript5/RegressionTests/parser618973.ts(1,21)
~~~~~~
!!! error TS1030: 'export' modifier already seen.
~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
public Bar() {
}
}
\ No newline at end of file
diff --git a/tests/baselines/reference/parserArgumentList1.errors.txt b/tests/baselines/reference/parserArgumentList1.errors.txt
index f20b47fa964..36d1a0fad37 100644
--- a/tests/baselines/reference/parserArgumentList1.errors.txt
+++ b/tests/baselines/reference/parserArgumentList1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts(1,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts(1,35): error TS2304: Cannot find name 'HTMLElement'.
tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts(2,42): error TS2304: Cannot find name '_classNameRegexp'.
@@ -6,7 +6,7 @@ tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts(2,42): error T
==== tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts (3 errors) ====
export function removeClass (node:HTMLElement, className:string) {
~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
~~~~~~~~~~~
!!! error TS2304: Cannot find name 'HTMLElement'.
node.className = node.className.replace(_classNameRegexp(className), function (everything, leftDelimiter, name, rightDelimiter) {
diff --git a/tests/baselines/reference/parserClass1.errors.txt b/tests/baselines/reference/parserClass1.errors.txt
index 62309f4ad61..da4fc8d870d 100644
--- a/tests/baselines/reference/parserClass1.errors.txt
+++ b/tests/baselines/reference/parserClass1.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass1.ts(1,18): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass1.ts(1,18): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass1.ts(1,40): error TS2304: Cannot find name 'ILogger'.
==== tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass1.ts (2 errors) ====
export class NullLogger implements ILogger {
~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
~~~~~~~
!!! error TS2304: Cannot find name 'ILogger'.
public information(): boolean { return false; }
diff --git a/tests/baselines/reference/parserClass2.errors.txt b/tests/baselines/reference/parserClass2.errors.txt
index d5ff6ff8910..39476805e1d 100644
--- a/tests/baselines/reference/parserClass2.errors.txt
+++ b/tests/baselines/reference/parserClass2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts(3,18): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts(3,18): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts(3,43): error TS2304: Cannot find name 'ILogger'.
tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts(4,37): error TS2304: Cannot find name 'ILogger'.
tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts(5,18): error TS2339: Property '_information' does not exist on type 'LoggerAdapter'.
@@ -9,7 +9,7 @@ tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts(5,1
export class LoggerAdapter implements ILogger {
~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
~~~~~~~
!!! error TS2304: Cannot find name 'ILogger'.
constructor (public logger: ILogger) {
diff --git a/tests/baselines/reference/parserEnum1.errors.txt b/tests/baselines/reference/parserEnum1.errors.txt
index e4550bbed3b..ca89c5fc104 100644
--- a/tests/baselines/reference/parserEnum1.errors.txt
+++ b/tests/baselines/reference/parserEnum1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum1.ts(3,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum1.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum1.ts (1 errors) ====
@@ -6,7 +6,7 @@ tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum1.ts(3,17)
export enum SignatureFlags {
~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
None = 0,
IsIndexer = 1,
IsStringIndexer = 1 << 1,
diff --git a/tests/baselines/reference/parserEnum2.errors.txt b/tests/baselines/reference/parserEnum2.errors.txt
index d2e2407387d..f8a841fd9ba 100644
--- a/tests/baselines/reference/parserEnum2.errors.txt
+++ b/tests/baselines/reference/parserEnum2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum2.ts(3,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum2.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum2.ts (1 errors) ====
@@ -6,7 +6,7 @@ tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum2.ts(3,17)
export enum SignatureFlags {
~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
None = 0,
IsIndexer = 1,
IsStringIndexer = 1 << 1,
diff --git a/tests/baselines/reference/parserEnum3.errors.txt b/tests/baselines/reference/parserEnum3.errors.txt
index 7628a5e1fec..463f338159a 100644
--- a/tests/baselines/reference/parserEnum3.errors.txt
+++ b/tests/baselines/reference/parserEnum3.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum3.ts(3,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum3.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum3.ts (1 errors) ====
@@ -6,5 +6,5 @@ tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum3.ts(3,17)
export enum SignatureFlags {
~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/parserEnum4.errors.txt b/tests/baselines/reference/parserEnum4.errors.txt
index 33c1f85a29d..9f2cd1d1862 100644
--- a/tests/baselines/reference/parserEnum4.errors.txt
+++ b/tests/baselines/reference/parserEnum4.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum4.ts(3,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum4.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum4.ts(4,9): error TS1132: Enum member expected.
@@ -7,7 +7,7 @@ tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum4.ts(4,9):
export enum SignatureFlags {
~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
,
~
!!! error TS1132: Enum member expected.
diff --git a/tests/baselines/reference/parserExportAssignment1.errors.txt b/tests/baselines/reference/parserExportAssignment1.errors.txt
index e6711946d25..cd153319f1a 100644
--- a/tests/baselines/reference/parserExportAssignment1.errors.txt
+++ b/tests/baselines/reference/parserExportAssignment1.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts(1,10): error TS2304: Cannot find name 'foo'.
==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts (2 errors) ====
export = foo
~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
~~~
!!! error TS2304: Cannot find name 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserExportAssignment2.errors.txt b/tests/baselines/reference/parserExportAssignment2.errors.txt
index 8a376dbe6d3..60eb0c1f43e 100644
--- a/tests/baselines/reference/parserExportAssignment2.errors.txt
+++ b/tests/baselines/reference/parserExportAssignment2.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts(1,10): error TS2304: Cannot find name 'foo'.
==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts (2 errors) ====
export = foo;
~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
~~~
!!! error TS2304: Cannot find name 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserExportAssignment3.errors.txt b/tests/baselines/reference/parserExportAssignment3.errors.txt
index 9836671be1e..b1e94a27469 100644
--- a/tests/baselines/reference/parserExportAssignment3.errors.txt
+++ b/tests/baselines/reference/parserExportAssignment3.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts(1,9): error TS1109: Expression expected.
==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts (2 errors) ====
export =
~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
!!! error TS1109: Expression expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserExportAssignment4.errors.txt b/tests/baselines/reference/parserExportAssignment4.errors.txt
index b6815753962..93e311bdb23 100644
--- a/tests/baselines/reference/parserExportAssignment4.errors.txt
+++ b/tests/baselines/reference/parserExportAssignment4.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts(1,10): error TS1109: Expression expected.
==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts (2 errors) ====
export = ;
~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
~
!!! error TS1109: Expression expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserExportAssignment5.errors.txt b/tests/baselines/reference/parserExportAssignment5.errors.txt
index 8444cdbce64..7b07e1d225f 100644
--- a/tests/baselines/reference/parserExportAssignment5.errors.txt
+++ b/tests/baselines/reference/parserExportAssignment5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts(2,5): error TS1063: An export assignment cannot be used in an internal module.
+tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts(2,5): error TS1063: An export assignment cannot be used in a namespace.
==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts (1 errors) ====
module M {
export = A;
~~~~~~~~~~~
-!!! error TS1063: An export assignment cannot be used in an internal module.
+!!! error TS1063: An export assignment cannot be used in a namespace.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/parserExportAssignment7.errors.txt b/tests/baselines/reference/parserExportAssignment7.errors.txt
index a6650c23540..7e54f2a4bce 100644
--- a/tests/baselines/reference/parserExportAssignment7.errors.txt
+++ b/tests/baselines/reference/parserExportAssignment7.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts(1,14): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts(4,1): error TS2309: An export assignment cannot be used in a module with other exported elements.
tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts(4,10): error TS2304: Cannot find name 'B'.
@@ -6,7 +6,7 @@ tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignm
==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts (3 errors) ====
export class C {
~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
}
export = B;
diff --git a/tests/baselines/reference/parserExportAssignment8.errors.txt b/tests/baselines/reference/parserExportAssignment8.errors.txt
index ac8feeeec58..71b37c99db7 100644
--- a/tests/baselines/reference/parserExportAssignment8.errors.txt
+++ b/tests/baselines/reference/parserExportAssignment8.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts(1,1): error TS2309: An export assignment cannot be used in a module with other exported elements.
tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts(1,10): error TS2304: Cannot find name 'B'.
@@ -6,7 +6,7 @@ tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignm
==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts (3 errors) ====
export = B;
~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
~~~~~~~~~~~
!!! error TS2309: An export assignment cannot be used in a module with other exported elements.
~
diff --git a/tests/baselines/reference/parserInterfaceDeclaration6.errors.txt b/tests/baselines/reference/parserInterfaceDeclaration6.errors.txt
index d697e5d8526..ab6985c5ab1 100644
--- a/tests/baselines/reference/parserInterfaceDeclaration6.errors.txt
+++ b/tests/baselines/reference/parserInterfaceDeclaration6.errors.txt
@@ -1,5 +1,5 @@
tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration6.ts(1,8): error TS1030: 'export' modifier already seen.
-tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration6.ts(1,25): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration6.ts(1,25): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration6.ts (2 errors) ====
@@ -7,5 +7,5 @@ tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterface
~~~~~~
!!! error TS1030: 'export' modifier already seen.
~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/parserInterfaceDeclaration7.errors.txt b/tests/baselines/reference/parserInterfaceDeclaration7.errors.txt
index acd7e83b606..344a5d9deb8 100644
--- a/tests/baselines/reference/parserInterfaceDeclaration7.errors.txt
+++ b/tests/baselines/reference/parserInterfaceDeclaration7.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7.ts(1,18): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7.ts(1,18): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7.ts (1 errors) ====
export interface I {
~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt b/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt
index 1530281b36b..973920e3584 100644
--- a/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt
+++ b/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts(1,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts(2,4): error TS1184: Modifiers cannot appear here.
==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts (2 errors) ====
export function foo() {
~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
export var x = this;
~~~~~~
!!! error TS1184: Modifiers cannot appear here.
diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock3.errors.txt b/tests/baselines/reference/parserModifierOnStatementInBlock3.errors.txt
index cff0ba1d50d..7a3fb004225 100644
--- a/tests/baselines/reference/parserModifierOnStatementInBlock3.errors.txt
+++ b/tests/baselines/reference/parserModifierOnStatementInBlock3.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts(1,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts(2,4): error TS1184: Modifiers cannot appear here.
==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts (2 errors) ====
export function foo() {
~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
export function bar() {
~~~~~~
!!! error TS1184: Modifiers cannot appear here.
diff --git a/tests/baselines/reference/parserModule1.errors.txt b/tests/baselines/reference/parserModule1.errors.txt
index de879f9563c..3a145493dd9 100644
--- a/tests/baselines/reference/parserModule1.errors.txt
+++ b/tests/baselines/reference/parserModule1.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts(1,19): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts(1,19): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts (1 errors) ====
export module CompilerDiagnostics {
~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
export var debug = false;
export interface IDiagnosticWriter {
Alert(output: string): void;
diff --git a/tests/baselines/reference/privacyGloImportParseErrors.errors.txt b/tests/baselines/reference/privacyGloImportParseErrors.errors.txt
index ac19571b8c0..d6d24ebcb30 100644
--- a/tests/baselines/reference/privacyGloImportParseErrors.errors.txt
+++ b/tests/baselines/reference/privacyGloImportParseErrors.errors.txt
@@ -1,21 +1,21 @@
-tests/cases/compiler/privacyGloImportParseErrors.ts(22,27): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/privacyGloImportParseErrors.ts(30,20): error TS2435: Ambient external modules cannot be nested in other modules.
+tests/cases/compiler/privacyGloImportParseErrors.ts(22,27): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/privacyGloImportParseErrors.ts(30,20): error TS2435: Ambient modules cannot be nested in other modules.
tests/cases/compiler/privacyGloImportParseErrors.ts(49,29): error TS4000: Import declaration 'm1_im2_private' is using private name 'm1_M2_private'.
-tests/cases/compiler/privacyGloImportParseErrors.ts(59,37): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyGloImportParseErrors.ts(59,37): error TS2307: Cannot find external module 'm1_M3_public'.
-tests/cases/compiler/privacyGloImportParseErrors.ts(69,37): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyGloImportParseErrors.ts(69,37): error TS2307: Cannot find external module 'm1_M4_private'.
+tests/cases/compiler/privacyGloImportParseErrors.ts(59,37): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyGloImportParseErrors.ts(59,37): error TS2307: Cannot find module 'm1_M3_public'.
+tests/cases/compiler/privacyGloImportParseErrors.ts(69,37): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyGloImportParseErrors.ts(69,37): error TS2307: Cannot find module 'm1_M4_private'.
tests/cases/compiler/privacyGloImportParseErrors.ts(80,35): error TS4000: Import declaration 'm1_im2_public' is using private name 'm1_M2_private'.
-tests/cases/compiler/privacyGloImportParseErrors.ts(81,43): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyGloImportParseErrors.ts(82,43): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyGloImportParseErrors.ts(121,38): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyGloImportParseErrors.ts(125,45): error TS1147: Import declarations in an internal module cannot reference an external module.
+tests/cases/compiler/privacyGloImportParseErrors.ts(81,43): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyGloImportParseErrors.ts(82,43): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyGloImportParseErrors.ts(121,38): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyGloImportParseErrors.ts(125,45): error TS1147: Import declarations in a namespace cannot reference a module.
tests/cases/compiler/privacyGloImportParseErrors.ts(133,9): error TS1038: A 'declare' modifier cannot be used in an already ambient context.
-tests/cases/compiler/privacyGloImportParseErrors.ts(133,24): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/privacyGloImportParseErrors.ts(138,16): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/privacyGloImportParseErrors.ts(141,12): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/privacyGloImportParseErrors.ts(146,25): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Import declarations in an internal module cannot reference an external module.
+tests/cases/compiler/privacyGloImportParseErrors.ts(133,24): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/privacyGloImportParseErrors.ts(138,16): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/privacyGloImportParseErrors.ts(141,12): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/privacyGloImportParseErrors.ts(146,25): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Import declarations in a namespace cannot reference a module.
==== tests/cases/compiler/privacyGloImportParseErrors.ts (18 errors) ====
@@ -42,7 +42,7 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Impor
export declare module "m1_M3_public" {
~~~~~~~~~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
export function f1();
export class c1 {
}
@@ -52,7 +52,7 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Impor
declare module "m1_M4_private" {
~~~~~~~~~~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
export function f1();
export class c1 {
}
@@ -85,9 +85,9 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Impor
import m1_im3_private = require("m1_M3_public");
~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'm1_M3_public'.
+!!! error TS2307: Cannot find module 'm1_M3_public'.
export var m1_im3_private_v1_public = m1_im3_private.c1;
export var m1_im3_private_v2_public = new m1_im3_private.c1();
export var m1_im3_private_v3_public = m1_im3_private.f1;
@@ -99,9 +99,9 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Impor
import m1_im4_private = require("m1_M4_private");
~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'm1_M4_private'.
+!!! error TS2307: Cannot find module 'm1_M4_private'.
export var m1_im4_private_v1_public = m1_im4_private.c1;
export var m1_im4_private_v2_public = new m1_im4_private.c1();
export var m1_im4_private_v3_public = m1_im4_private.f1;
@@ -117,10 +117,10 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Impor
!!! error TS4000: Import declaration 'm1_im2_public' is using private name 'm1_M2_private'.
export import m1_im3_public = require("m1_M3_public");
~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
export import m1_im4_public = require("m1_M4_private");
~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
}
module glo_M1_public {
@@ -161,13 +161,13 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Impor
module m2 {
import errorImport = require("glo_M2_public");
~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
import nonerrorImport = glo_M1_public;
module m5 {
import m5_errorImport = require("glo_M2_public");
~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
import m5_nonerrorImport = glo_M1_public;
}
}
@@ -179,31 +179,31 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Impor
~~~~~~~
!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context.
~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
}
}
module m2 {
module "abc2" {
~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
}
}
module "abc3" {
~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
}
}
module m2 {
import m3 = require("use_glo_M1_public");
~~~~~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
module m4 {
var a = 10;
import m2 = require("use_glo_M1_public");
~~~~~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
}
}
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyImportParseErrors.errors.txt b/tests/baselines/reference/privacyImportParseErrors.errors.txt
index a81bfbe738b..06277c63b23 100644
--- a/tests/baselines/reference/privacyImportParseErrors.errors.txt
+++ b/tests/baselines/reference/privacyImportParseErrors.errors.txt
@@ -1,52 +1,52 @@
-tests/cases/compiler/privacyImportParseErrors.ts(22,27): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/privacyImportParseErrors.ts(30,20): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/privacyImportParseErrors.ts(59,37): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyImportParseErrors.ts(59,37): error TS2307: Cannot find external module 'm1_M3_public'.
-tests/cases/compiler/privacyImportParseErrors.ts(69,37): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyImportParseErrors.ts(69,37): error TS2307: Cannot find external module 'm1_M4_private'.
-tests/cases/compiler/privacyImportParseErrors.ts(81,43): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyImportParseErrors.ts(82,43): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyImportParseErrors.ts(106,27): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/privacyImportParseErrors.ts(114,20): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/privacyImportParseErrors.ts(143,37): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyImportParseErrors.ts(143,37): error TS2307: Cannot find external module 'm2_M3_public'.
-tests/cases/compiler/privacyImportParseErrors.ts(153,37): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyImportParseErrors.ts(153,37): error TS2307: Cannot find external module 'm2_M4_private'.
-tests/cases/compiler/privacyImportParseErrors.ts(166,43): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyImportParseErrors.ts(167,43): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyImportParseErrors.ts(180,23): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/privacyImportParseErrors.ts(198,23): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/privacyImportParseErrors.ts(218,34): error TS2307: Cannot find external module 'glo_M2_public'.
-tests/cases/compiler/privacyImportParseErrors.ts(238,34): error TS2307: Cannot find external module 'glo_M4_private'.
-tests/cases/compiler/privacyImportParseErrors.ts(251,40): error TS2307: Cannot find external module 'glo_M2_public'.
-tests/cases/compiler/privacyImportParseErrors.ts(252,40): error TS2307: Cannot find external module 'glo_M4_private'.
-tests/cases/compiler/privacyImportParseErrors.ts(255,23): error TS2435: Ambient external modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(22,27): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(30,20): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(59,37): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyImportParseErrors.ts(59,37): error TS2307: Cannot find module 'm1_M3_public'.
+tests/cases/compiler/privacyImportParseErrors.ts(69,37): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyImportParseErrors.ts(69,37): error TS2307: Cannot find module 'm1_M4_private'.
+tests/cases/compiler/privacyImportParseErrors.ts(81,43): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyImportParseErrors.ts(82,43): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyImportParseErrors.ts(106,27): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(114,20): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(143,37): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyImportParseErrors.ts(143,37): error TS2307: Cannot find module 'm2_M3_public'.
+tests/cases/compiler/privacyImportParseErrors.ts(153,37): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyImportParseErrors.ts(153,37): error TS2307: Cannot find module 'm2_M4_private'.
+tests/cases/compiler/privacyImportParseErrors.ts(166,43): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyImportParseErrors.ts(167,43): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyImportParseErrors.ts(180,23): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(198,23): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(218,34): error TS2307: Cannot find module 'glo_M2_public'.
+tests/cases/compiler/privacyImportParseErrors.ts(238,34): error TS2307: Cannot find module 'glo_M4_private'.
+tests/cases/compiler/privacyImportParseErrors.ts(251,40): error TS2307: Cannot find module 'glo_M2_public'.
+tests/cases/compiler/privacyImportParseErrors.ts(252,40): error TS2307: Cannot find module 'glo_M4_private'.
+tests/cases/compiler/privacyImportParseErrors.ts(255,23): error TS2435: Ambient modules cannot be nested in other modules.
tests/cases/compiler/privacyImportParseErrors.ts(258,45): error TS2304: Cannot find name 'use_glo_M1_public'.
tests/cases/compiler/privacyImportParseErrors.ts(261,39): error TS2304: Cannot find name 'use_glo_M1_public'.
-tests/cases/compiler/privacyImportParseErrors.ts(264,40): error TS2307: Cannot find external module 'glo_M2_public'.
-tests/cases/compiler/privacyImportParseErrors.ts(273,38): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyImportParseErrors.ts(277,45): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyImportParseErrors.ts(284,16): error TS2435: Ambient external modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(264,40): error TS2307: Cannot find module 'glo_M2_public'.
+tests/cases/compiler/privacyImportParseErrors.ts(273,38): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyImportParseErrors.ts(277,45): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyImportParseErrors.ts(284,16): error TS2435: Ambient modules cannot be nested in other modules.
tests/cases/compiler/privacyImportParseErrors.ts(287,46): error TS2304: Cannot find name 'use_glo_M3_private'.
tests/cases/compiler/privacyImportParseErrors.ts(290,40): error TS2304: Cannot find name 'use_glo_M3_private'.
-tests/cases/compiler/privacyImportParseErrors.ts(293,41): error TS2307: Cannot find external module 'glo_M4_private'.
-tests/cases/compiler/privacyImportParseErrors.ts(302,38): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyImportParseErrors.ts(306,45): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyImportParseErrors.ts(312,16): error TS2435: Ambient external modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(293,41): error TS2307: Cannot find module 'glo_M4_private'.
+tests/cases/compiler/privacyImportParseErrors.ts(302,38): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyImportParseErrors.ts(306,45): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyImportParseErrors.ts(312,16): error TS2435: Ambient modules cannot be nested in other modules.
tests/cases/compiler/privacyImportParseErrors.ts(314,9): error TS1038: A 'declare' modifier cannot be used in an already ambient context.
-tests/cases/compiler/privacyImportParseErrors.ts(314,24): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/privacyImportParseErrors.ts(319,16): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/privacyImportParseErrors.ts(322,12): error TS2435: Ambient external modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(314,24): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(319,16): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(322,12): error TS2435: Ambient modules cannot be nested in other modules.
tests/cases/compiler/privacyImportParseErrors.ts(326,9): error TS1029: 'export' modifier must precede 'declare' modifier.
-tests/cases/compiler/privacyImportParseErrors.ts(326,23): error TS2435: Ambient external modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(326,23): error TS2435: Ambient modules cannot be nested in other modules.
tests/cases/compiler/privacyImportParseErrors.ts(328,9): error TS1038: A 'declare' modifier cannot be used in an already ambient context.
-tests/cases/compiler/privacyImportParseErrors.ts(328,24): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/privacyImportParseErrors.ts(333,16): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/privacyImportParseErrors.ts(336,12): error TS2435: Ambient external modules cannot be nested in other modules.
-tests/cases/compiler/privacyImportParseErrors.ts(341,25): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyImportParseErrors.ts(344,29): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyImportParseErrors.ts(350,25): error TS1147: Import declarations in an internal module cannot reference an external module.
-tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in an internal module cannot reference an external module.
+tests/cases/compiler/privacyImportParseErrors.ts(328,24): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(333,16): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(336,12): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/privacyImportParseErrors.ts(341,25): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyImportParseErrors.ts(344,29): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyImportParseErrors.ts(350,25): error TS1147: Import declarations in a namespace cannot reference a module.
+tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import declarations in a namespace cannot reference a module.
==== tests/cases/compiler/privacyImportParseErrors.ts (49 errors) ====
@@ -73,7 +73,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
export declare module "m1_M3_public" {
~~~~~~~~~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
export function f1();
export class c1 {
}
@@ -83,7 +83,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
declare module "m1_M4_private" {
~~~~~~~~~~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
export function f1();
export class c1 {
}
@@ -114,9 +114,9 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
import m1_im3_private = require("m1_M3_public");
~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'm1_M3_public'.
+!!! error TS2307: Cannot find module 'm1_M3_public'.
export var m1_im3_private_v1_public = m1_im3_private.c1;
export var m1_im3_private_v2_public = new m1_im3_private.c1();
export var m1_im3_private_v3_public = m1_im3_private.f1;
@@ -128,9 +128,9 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
import m1_im4_private = require("m1_M4_private");
~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'm1_M4_private'.
+!!! error TS2307: Cannot find module 'm1_M4_private'.
export var m1_im4_private_v1_public = m1_im4_private.c1;
export var m1_im4_private_v2_public = new m1_im4_private.c1();
export var m1_im4_private_v3_public = m1_im4_private.f1;
@@ -144,10 +144,10 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
export import m1_im2_public = m1_M2_private;
export import m1_im3_public = require("m1_M3_public");
~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
export import m1_im4_public = require("m1_M4_private");
~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
}
module m2 {
@@ -173,7 +173,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
export declare module "m2_M3_public" {
~~~~~~~~~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
export function f1();
export class c1 {
}
@@ -183,7 +183,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
declare module "m2_M4_private" {
~~~~~~~~~~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
export function f1();
export class c1 {
}
@@ -214,9 +214,9 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
import m1_im3_private = require("m2_M3_public");
~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'm2_M3_public'.
+!!! error TS2307: Cannot find module 'm2_M3_public'.
export var m1_im3_private_v1_public = m1_im3_private.c1;
export var m1_im3_private_v2_public = new m1_im3_private.c1();
export var m1_im3_private_v3_public = m1_im3_private.f1;
@@ -228,9 +228,9 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
import m1_im4_private = require("m2_M4_private");
~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'm2_M4_private'.
+!!! error TS2307: Cannot find module 'm2_M4_private'.
export var m1_im4_private_v1_public = m1_im4_private.c1;
export var m1_im4_private_v2_public = new m1_im4_private.c1();
export var m1_im4_private_v3_public = m1_im4_private.f1;
@@ -245,10 +245,10 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
export import m1_im2_public = m2_M2_private;
export import m1_im3_public = require("m2_M3_public");
~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
export import m1_im4_public = require("m2_M4_private");
~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
}
export module glo_M1_public {
@@ -263,7 +263,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
export declare module "glo_M2_public" {
~~~~~~~~~~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
export function f1();
export class c1 {
}
@@ -283,7 +283,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
export declare module "glo_M4_private" {
~~~~~~~~~~~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
export function f1();
export class c1 {
}
@@ -305,7 +305,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
import glo_im2_private = require("glo_M2_public");
~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'glo_M2_public'.
+!!! error TS2307: Cannot find module 'glo_M2_public'.
export var glo_im2_private_v1_public = glo_im2_private.c1;
export var glo_im2_private_v2_public = new glo_im2_private.c1();
export var glo_im2_private_v3_public = glo_im2_private.f1;
@@ -327,7 +327,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
import glo_im4_private = require("glo_M4_private");
~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'glo_M4_private'.
+!!! error TS2307: Cannot find module 'glo_M4_private'.
export var glo_im4_private_v1_public = glo_im4_private.c1;
export var glo_im4_private_v2_public = new glo_im4_private.c1();
export var glo_im4_private_v3_public = glo_im4_private.f1;
@@ -342,15 +342,15 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
export import glo_im2_public = glo_M3_private;
export import glo_im3_public = require("glo_M2_public");
~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'glo_M2_public'.
+!!! error TS2307: Cannot find module 'glo_M2_public'.
export import glo_im4_public = require("glo_M4_private");
~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'glo_M4_private'.
+!!! error TS2307: Cannot find module 'glo_M4_private'.
export declare module "use_glo_M1_public" {
~~~~~~~~~~~~~~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
import use_glo_M1_public = glo_M1_public;
export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
export var use_glo_M1_public_v2_public: use_glo_M1_public;
@@ -365,7 +365,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
import use_glo_M2_public = require("glo_M2_public");
~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'glo_M2_public'.
+!!! error TS2307: Cannot find module 'glo_M2_public'.
export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
export var use_glo_M2_public_v2_public: use_glo_M2_public;
export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
@@ -376,13 +376,13 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
module m2 {
import errorImport = require("glo_M2_public");
~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
import nonerrorImport = glo_M1_public;
module m5 {
import m5_errorImport = require("glo_M2_public");
~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
import m5_nonerrorImport = glo_M1_public;
}
}
@@ -391,7 +391,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
declare module "use_glo_M3_private" {
~~~~~~~~~~~~~~~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
import use_glo_M3_private = glo_M3_private;
export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
export var use_glo_M3_private_v2_public: use_glo_M3_private;
@@ -406,7 +406,7 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
import use_glo_M4_private = require("glo_M4_private");
~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'glo_M4_private'.
+!!! error TS2307: Cannot find module 'glo_M4_private'.
export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
export var use_glo_M4_private_v2_public: use_glo_M4_private;
export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
@@ -417,13 +417,13 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
module m2 {
import errorImport = require("glo_M4_private");
~~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
import nonerrorImport = glo_M3_private;
module m5 {
import m5_errorImport = require("glo_M4_private");
~~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
import m5_nonerrorImport = glo_M3_private;
}
}
@@ -431,25 +431,25 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
declare module "anotherParseError" {
~~~~~~~~~~~~~~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
module m2 {
declare module "abc" {
~~~~~~~
!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context.
~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
}
}
module m2 {
module "abc2" {
~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
}
}
module "abc3" {
~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
}
}
@@ -457,37 +457,37 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
~~~~~~
!!! error TS1029: 'export' modifier must precede 'declare' modifier.
~~~~~~~~~~~~~~~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
module m2 {
declare module "abc" {
~~~~~~~
!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context.
~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
}
}
module m2 {
module "abc2" {
~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
}
}
module "abc3" {
~~~~~~
-!!! error TS2435: Ambient external modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules.
}
}
module m2 {
import m3 = require("use_glo_M1_public");
~~~~~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
module m4 {
var a = 10;
import m2 = require("use_glo_M1_public");
~~~~~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
}
}
@@ -495,12 +495,12 @@ tests/cases/compiler/privacyImportParseErrors.ts(353,29): error TS1147: Import d
export module m3 {
import m3 = require("use_glo_M1_public");
~~~~~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
module m4 {
var a = 10;
import m2 = require("use_glo_M1_public");
~~~~~~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
}
}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.errors.txt b/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.errors.txt
index cd1e6ff521c..7c071fdc208 100644
--- a/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.errors.txt
+++ b/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.errors.txt
@@ -1,18 +1,18 @@
-decl.ts(1,26): error TS2307: Cannot find external module './foo/bar.js'.
-decl.ts(2,26): error TS2307: Cannot find external module 'baz'.
-decl.ts(3,26): error TS2307: Cannot find external module './baz'.
+decl.ts(1,26): error TS2307: Cannot find module './foo/bar.js'.
+decl.ts(2,26): error TS2307: Cannot find module 'baz'.
+decl.ts(3,26): error TS2307: Cannot find module './baz'.
==== decl.ts (3 errors) ====
import modErr = require("./foo/bar.js");
~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module './foo/bar.js'.
+!!! error TS2307: Cannot find module './foo/bar.js'.
import modErr1 = require("baz");
~~~~~
-!!! error TS2307: Cannot find external module 'baz'.
+!!! error TS2307: Cannot find module 'baz'.
import modErr2 = require("./baz");
~~~~~~~
-!!! error TS2307: Cannot find external module './baz'.
+!!! error TS2307: Cannot find module './baz'.
//import modErr1 = require("\bar");
diff --git a/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.errors.txt b/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.errors.txt
index cd1e6ff521c..7c071fdc208 100644
--- a/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.errors.txt
+++ b/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.errors.txt
@@ -1,18 +1,18 @@
-decl.ts(1,26): error TS2307: Cannot find external module './foo/bar.js'.
-decl.ts(2,26): error TS2307: Cannot find external module 'baz'.
-decl.ts(3,26): error TS2307: Cannot find external module './baz'.
+decl.ts(1,26): error TS2307: Cannot find module './foo/bar.js'.
+decl.ts(2,26): error TS2307: Cannot find module 'baz'.
+decl.ts(3,26): error TS2307: Cannot find module './baz'.
==== decl.ts (3 errors) ====
import modErr = require("./foo/bar.js");
~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module './foo/bar.js'.
+!!! error TS2307: Cannot find module './foo/bar.js'.
import modErr1 = require("baz");
~~~~~
-!!! error TS2307: Cannot find external module 'baz'.
+!!! error TS2307: Cannot find module 'baz'.
import modErr2 = require("./baz");
~~~~~~~
-!!! error TS2307: Cannot find external module './baz'.
+!!! error TS2307: Cannot find module './baz'.
//import modErr1 = require("\bar");
diff --git a/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt b/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt
index bfc09e40188..c4ad5e69c83 100644
--- a/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt
+++ b/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt
@@ -1,14 +1,14 @@
-internal2.ts(2,21): error TS1147: Import declarations in an internal module cannot reference an external module.
-internal2.ts(2,21): error TS2307: Cannot find external module 'external2'.
+internal2.ts(2,21): error TS1147: Import declarations in a namespace cannot reference a module.
+internal2.ts(2,21): error TS2307: Cannot find module 'external2'.
==== internal2.ts (2 errors) ====
module outer {
import g = require("external2")
~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'external2'.
+!!! error TS2307: Cannot find module 'external2'.
export var a = g.square(5);
export var b = "foo";
}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt b/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt
index bfc09e40188..c4ad5e69c83 100644
--- a/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt
+++ b/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt
@@ -1,14 +1,14 @@
-internal2.ts(2,21): error TS1147: Import declarations in an internal module cannot reference an external module.
-internal2.ts(2,21): error TS2307: Cannot find external module 'external2'.
+internal2.ts(2,21): error TS1147: Import declarations in a namespace cannot reference a module.
+internal2.ts(2,21): error TS2307: Cannot find module 'external2'.
==== internal2.ts (2 errors) ====
module outer {
import g = require("external2")
~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'external2'.
+!!! error TS2307: Cannot find module 'external2'.
export var a = g.square(5);
export var b = "foo";
}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt
index d8a57865c22..2b17a05139a 100644
--- a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt
+++ b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt
@@ -1,11 +1,11 @@
-test1.ts(2,23): error TS1147: Import declarations in an internal module cannot reference an external module.
+test1.ts(2,23): error TS1147: Import declarations in a namespace cannot reference a module.
==== test1.ts (1 errors) ====
export module myModule {
import foo = require("test2");
~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
//console.log(foo.$);
}
diff --git a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt
index d8a57865c22..2b17a05139a 100644
--- a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt
+++ b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt
@@ -1,11 +1,11 @@
-test1.ts(2,23): error TS1147: Import declarations in an internal module cannot reference an external module.
+test1.ts(2,23): error TS1147: Import declarations in a namespace cannot reference a module.
==== test1.ts (1 errors) ====
export module myModule {
import foo = require("test2");
~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
//console.log(foo.$);
}
diff --git a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt
index e205f308c0a..a8fb4fc1b23 100644
--- a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt
+++ b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt
@@ -1,5 +1,5 @@
-test1.ts(3,23): error TS1147: Import declarations in an internal module cannot reference an external module.
-test1.ts(3,23): error TS2307: Cannot find external module 'test2'.
+test1.ts(3,23): error TS1147: Import declarations in a namespace cannot reference a module.
+test1.ts(3,23): error TS2307: Cannot find module 'test2'.
==== test1.ts (2 errors) ====
@@ -7,9 +7,9 @@ test1.ts(3,23): error TS2307: Cannot find external module 'test2'.
import foo = require("test2");
~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~
-!!! error TS2307: Cannot find external module 'test2'.
+!!! error TS2307: Cannot find module 'test2'.
//console.log(foo.$);
diff --git a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt
index e205f308c0a..a8fb4fc1b23 100644
--- a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt
+++ b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt
@@ -1,5 +1,5 @@
-test1.ts(3,23): error TS1147: Import declarations in an internal module cannot reference an external module.
-test1.ts(3,23): error TS2307: Cannot find external module 'test2'.
+test1.ts(3,23): error TS1147: Import declarations in a namespace cannot reference a module.
+test1.ts(3,23): error TS2307: Cannot find module 'test2'.
==== test1.ts (2 errors) ====
@@ -7,9 +7,9 @@ test1.ts(3,23): error TS2307: Cannot find external module 'test2'.
import foo = require("test2");
~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~
-!!! error TS2307: Cannot find external module 'test2'.
+!!! error TS2307: Cannot find module 'test2'.
//console.log(foo.$);
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
index eabc4e5656a..0ed31c4ea38 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
@@ -1,16 +1,16 @@
-testGlo.ts(2,39): error TS1147: Import declarations in an internal module cannot reference an external module.
-testGlo.ts(2,39): error TS2307: Cannot find external module 'mExported'.
-testGlo.ts(21,35): error TS1147: Import declarations in an internal module cannot reference an external module.
-testGlo.ts(21,35): error TS2307: Cannot find external module 'mNonExported'.
+testGlo.ts(2,39): error TS1147: Import declarations in a namespace cannot reference a module.
+testGlo.ts(2,39): error TS2307: Cannot find module 'mExported'.
+testGlo.ts(21,35): error TS1147: Import declarations in a namespace cannot reference a module.
+testGlo.ts(21,35): error TS2307: Cannot find module 'mNonExported'.
==== testGlo.ts (4 errors) ====
module m2 {
export import mExported = require("mExported");
~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'mExported'.
+!!! error TS2307: Cannot find module 'mExported'.
export var c1 = new mExported.me.class1;
export function f1() {
return new mExported.me.class1();
@@ -31,9 +31,9 @@ testGlo.ts(21,35): error TS2307: Cannot find external module 'mNonExported'.
import mNonExported = require("mNonExported");
~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'mNonExported'.
+!!! error TS2307: Cannot find module 'mNonExported'.
export var c3 = new mNonExported.mne.class1;
export function f3() {
return new mNonExported.mne.class1();
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
index eabc4e5656a..0ed31c4ea38 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
@@ -1,16 +1,16 @@
-testGlo.ts(2,39): error TS1147: Import declarations in an internal module cannot reference an external module.
-testGlo.ts(2,39): error TS2307: Cannot find external module 'mExported'.
-testGlo.ts(21,35): error TS1147: Import declarations in an internal module cannot reference an external module.
-testGlo.ts(21,35): error TS2307: Cannot find external module 'mNonExported'.
+testGlo.ts(2,39): error TS1147: Import declarations in a namespace cannot reference a module.
+testGlo.ts(2,39): error TS2307: Cannot find module 'mExported'.
+testGlo.ts(21,35): error TS1147: Import declarations in a namespace cannot reference a module.
+testGlo.ts(21,35): error TS2307: Cannot find module 'mNonExported'.
==== testGlo.ts (4 errors) ====
module m2 {
export import mExported = require("mExported");
~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'mExported'.
+!!! error TS2307: Cannot find module 'mExported'.
export var c1 = new mExported.me.class1;
export function f1() {
return new mExported.me.class1();
@@ -31,9 +31,9 @@ testGlo.ts(21,35): error TS2307: Cannot find external module 'mNonExported'.
import mNonExported = require("mNonExported");
~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'mNonExported'.
+!!! error TS2307: Cannot find module 'mNonExported'.
export var c3 = new mNonExported.mne.class1;
export function f3() {
return new mNonExported.mne.class1();
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
index 820d18ffb98..126d5b696c1 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
@@ -1,7 +1,7 @@
-test.ts(5,39): error TS1147: Import declarations in an internal module cannot reference an external module.
-test.ts(5,39): error TS2307: Cannot find external module 'mExported'.
-test.ts(24,35): error TS1147: Import declarations in an internal module cannot reference an external module.
-test.ts(24,35): error TS2307: Cannot find external module 'mNonExported'.
+test.ts(5,39): error TS1147: Import declarations in a namespace cannot reference a module.
+test.ts(5,39): error TS2307: Cannot find module 'mExported'.
+test.ts(24,35): error TS1147: Import declarations in a namespace cannot reference a module.
+test.ts(24,35): error TS2307: Cannot find module 'mNonExported'.
==== test.ts (4 errors) ====
@@ -11,9 +11,9 @@ test.ts(24,35): error TS2307: Cannot find external module 'mNonExported'.
module m2 {
export import mExported = require("mExported");
~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'mExported'.
+!!! error TS2307: Cannot find module 'mExported'.
export var c1 = new mExported.me.class1;
export function f1() {
return new mExported.me.class1();
@@ -34,9 +34,9 @@ test.ts(24,35): error TS2307: Cannot find external module 'mNonExported'.
import mNonExported = require("mNonExported");
~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'mNonExported'.
+!!! error TS2307: Cannot find module 'mNonExported'.
export var c3 = new mNonExported.mne.class1;
export function f3() {
return new mNonExported.mne.class1();
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
index 820d18ffb98..126d5b696c1 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
@@ -1,7 +1,7 @@
-test.ts(5,39): error TS1147: Import declarations in an internal module cannot reference an external module.
-test.ts(5,39): error TS2307: Cannot find external module 'mExported'.
-test.ts(24,35): error TS1147: Import declarations in an internal module cannot reference an external module.
-test.ts(24,35): error TS2307: Cannot find external module 'mNonExported'.
+test.ts(5,39): error TS1147: Import declarations in a namespace cannot reference a module.
+test.ts(5,39): error TS2307: Cannot find module 'mExported'.
+test.ts(24,35): error TS1147: Import declarations in a namespace cannot reference a module.
+test.ts(24,35): error TS2307: Cannot find module 'mNonExported'.
==== test.ts (4 errors) ====
@@ -11,9 +11,9 @@ test.ts(24,35): error TS2307: Cannot find external module 'mNonExported'.
module m2 {
export import mExported = require("mExported");
~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'mExported'.
+!!! error TS2307: Cannot find module 'mExported'.
export var c1 = new mExported.me.class1;
export function f1() {
return new mExported.me.class1();
@@ -34,9 +34,9 @@ test.ts(24,35): error TS2307: Cannot find external module 'mNonExported'.
import mNonExported = require("mNonExported");
~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'mNonExported'.
+!!! error TS2307: Cannot find module 'mNonExported'.
export var c3 = new mNonExported.mne.class1;
export function f3() {
return new mNonExported.mne.class1();
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
index ed865949b87..872e43a9b4f 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
@@ -1,16 +1,16 @@
-test.ts(2,39): error TS1147: Import declarations in an internal module cannot reference an external module.
-test.ts(2,39): error TS2307: Cannot find external module 'mExported'.
-test.ts(42,35): error TS1147: Import declarations in an internal module cannot reference an external module.
-test.ts(42,35): error TS2307: Cannot find external module 'mNonExported'.
+test.ts(2,39): error TS1147: Import declarations in a namespace cannot reference a module.
+test.ts(2,39): error TS2307: Cannot find module 'mExported'.
+test.ts(42,35): error TS1147: Import declarations in a namespace cannot reference a module.
+test.ts(42,35): error TS2307: Cannot find module 'mNonExported'.
==== test.ts (4 errors) ====
export module m2 {
export import mExported = require("mExported");
~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'mExported'.
+!!! error TS2307: Cannot find module 'mExported'.
module Internal_M1 {
export var c1 = new mExported.me.class1;
@@ -52,9 +52,9 @@ test.ts(42,35): error TS2307: Cannot find external module 'mNonExported'.
import mNonExported = require("mNonExported");
~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'mNonExported'.
+!!! error TS2307: Cannot find module 'mNonExported'.
module Internal_M3 {
export var c3 = new mNonExported.mne.class1;
export function f3() {
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
index ed865949b87..872e43a9b4f 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
@@ -1,16 +1,16 @@
-test.ts(2,39): error TS1147: Import declarations in an internal module cannot reference an external module.
-test.ts(2,39): error TS2307: Cannot find external module 'mExported'.
-test.ts(42,35): error TS1147: Import declarations in an internal module cannot reference an external module.
-test.ts(42,35): error TS2307: Cannot find external module 'mNonExported'.
+test.ts(2,39): error TS1147: Import declarations in a namespace cannot reference a module.
+test.ts(2,39): error TS2307: Cannot find module 'mExported'.
+test.ts(42,35): error TS1147: Import declarations in a namespace cannot reference a module.
+test.ts(42,35): error TS2307: Cannot find module 'mNonExported'.
==== test.ts (4 errors) ====
export module m2 {
export import mExported = require("mExported");
~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'mExported'.
+!!! error TS2307: Cannot find module 'mExported'.
module Internal_M1 {
export var c1 = new mExported.me.class1;
@@ -52,9 +52,9 @@ test.ts(42,35): error TS2307: Cannot find external module 'mNonExported'.
import mNonExported = require("mNonExported");
~~~~~~~~~~~~~~
-!!! error TS1147: Import declarations in an internal module cannot reference an external module.
+!!! error TS1147: Import declarations in a namespace cannot reference a module.
~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'mNonExported'.
+!!! error TS2307: Cannot find module 'mNonExported'.
module Internal_M3 {
export var c3 = new mNonExported.mne.class1;
export function f3() {
diff --git a/tests/baselines/reference/relativePathMustResolve.errors.txt b/tests/baselines/reference/relativePathMustResolve.errors.txt
index 700913f65d7..1ff89a74623 100644
--- a/tests/baselines/reference/relativePathMustResolve.errors.txt
+++ b/tests/baselines/reference/relativePathMustResolve.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/externalModules/foo_1.ts(1,22): error TS2307: Cannot find external module './test/foo'.
+tests/cases/conformance/externalModules/foo_1.ts(1,22): error TS2307: Cannot find module './test/foo'.
==== tests/cases/conformance/externalModules/foo_1.ts (1 errors) ====
import foo = require('./test/foo');
~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module './test/foo'.
+!!! error TS2307: Cannot find module './test/foo'.
var z = foo.x + 10;
==== tests/cases/conformance/externalModules/foo_0.ts (0 errors) ====
diff --git a/tests/baselines/reference/relativePathToDeclarationFile.errors.txt b/tests/baselines/reference/relativePathToDeclarationFile.errors.txt
index 51ea1f54c4c..041dd5c3a8f 100644
--- a/tests/baselines/reference/relativePathToDeclarationFile.errors.txt
+++ b/tests/baselines/reference/relativePathToDeclarationFile.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/externalModules/test/foo.d.ts(1,23): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/externalModules/test/foo.d.ts(1,23): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/externalModules/test/file1.ts (0 errors) ====
@@ -13,7 +13,7 @@ tests/cases/conformance/externalModules/test/foo.d.ts(1,23): error TS1148: Canno
==== tests/cases/conformance/externalModules/test/foo.d.ts (1 errors) ====
export declare module M2 {
~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
export var x: boolean;
}
diff --git a/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt b/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt
index ca5f178193b..7094bc6699f 100644
--- a/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt
+++ b/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/requireOfAnEmptyFile1_a.ts(3,21): error TS2306: File 'tests/cases/compiler/requireOfAnEmptyFile1_b.ts' is not an external module.
+tests/cases/compiler/requireOfAnEmptyFile1_a.ts(3,21): error TS2306: File 'tests/cases/compiler/requireOfAnEmptyFile1_b.ts' is not a module.
==== tests/cases/compiler/requireOfAnEmptyFile1_a.ts (1 errors) ====
@@ -6,7 +6,7 @@ tests/cases/compiler/requireOfAnEmptyFile1_a.ts(3,21): error TS2306: File 'tests
import fs = require('requireOfAnEmptyFile1_b');
~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2306: File 'requireOfAnEmptyFile1_b.ts' is not an external module.
+!!! error TS2306: File 'requireOfAnEmptyFile1_b.ts' is not a module.
==== tests/cases/compiler/requireOfAnEmptyFile1_b.ts (0 errors) ====
\ No newline at end of file
diff --git a/tests/baselines/reference/reservedWords2.errors.txt b/tests/baselines/reference/reservedWords2.errors.txt
index 3b3fe2c502c..471eef4710a 100644
--- a/tests/baselines/reference/reservedWords2.errors.txt
+++ b/tests/baselines/reference/reservedWords2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/reservedWords2.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/compiler/reservedWords2.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/compiler/reservedWords2.ts(1,8): error TS1109: Expression expected.
tests/cases/compiler/reservedWords2.ts(1,14): error TS1005: '(' expected.
tests/cases/compiler/reservedWords2.ts(1,16): error TS2304: Cannot find name 'require'.
@@ -34,7 +34,7 @@ tests/cases/compiler/reservedWords2.ts(10,6): error TS1003: Identifier expected.
==== tests/cases/compiler/reservedWords2.ts (31 errors) ====
import while = require("dfdf");
~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
~~~~~
!!! error TS1109: Expression expected.
~
diff --git a/tests/baselines/reference/scannerClass2.errors.txt b/tests/baselines/reference/scannerClass2.errors.txt
index 7a59478ade2..74b62602dad 100644
--- a/tests/baselines/reference/scannerClass2.errors.txt
+++ b/tests/baselines/reference/scannerClass2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts(3,18): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts(3,18): error TS1148: Cannot compile modules unless the '--module' flag is provided.
tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts(3,43): error TS2304: Cannot find name 'ILogger'.
tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts(4,37): error TS2304: Cannot find name 'ILogger'.
tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts(5,18): error TS2339: Property '_information' does not exist on type 'LoggerAdapter'.
@@ -9,7 +9,7 @@ tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts(5,18): error TS2339
export class LoggerAdapter implements ILogger {
~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
~~~~~~~
!!! error TS2304: Cannot find name 'ILogger'.
constructor (public logger: ILogger) {
diff --git a/tests/baselines/reference/scannerEnum1.errors.txt b/tests/baselines/reference/scannerEnum1.errors.txt
index b55fa92503c..64d7508980f 100644
--- a/tests/baselines/reference/scannerEnum1.errors.txt
+++ b/tests/baselines/reference/scannerEnum1.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/scanner/ecmascript5/scannerEnum1.ts(1,17): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/scanner/ecmascript5/scannerEnum1.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/scanner/ecmascript5/scannerEnum1.ts (1 errors) ====
export enum CodeGenTarget {
~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
ES3 = 0,
ES5 = 1,
}
\ No newline at end of file
diff --git a/tests/baselines/reference/separateCompilationImportExportElision.errors.txt b/tests/baselines/reference/separateCompilationImportExportElision.errors.txt
index db418681e83..0bac01d8134 100644
--- a/tests/baselines/reference/separateCompilationImportExportElision.errors.txt
+++ b/tests/baselines/reference/separateCompilationImportExportElision.errors.txt
@@ -1,20 +1,20 @@
-tests/cases/compiler/separateCompilationImportExportElision.ts(2,17): error TS2307: Cannot find external module 'module'.
-tests/cases/compiler/separateCompilationImportExportElision.ts(3,18): error TS2307: Cannot find external module 'module'.
-tests/cases/compiler/separateCompilationImportExportElision.ts(4,21): error TS2307: Cannot find external module 'module'.
-tests/cases/compiler/separateCompilationImportExportElision.ts(12,18): error TS2307: Cannot find external module 'module'.
+tests/cases/compiler/separateCompilationImportExportElision.ts(2,17): error TS2307: Cannot find module 'module'.
+tests/cases/compiler/separateCompilationImportExportElision.ts(3,18): error TS2307: Cannot find module 'module'.
+tests/cases/compiler/separateCompilationImportExportElision.ts(4,21): error TS2307: Cannot find module 'module'.
+tests/cases/compiler/separateCompilationImportExportElision.ts(12,18): error TS2307: Cannot find module 'module'.
==== tests/cases/compiler/separateCompilationImportExportElision.ts (4 errors) ====
import {c} from "module"
~~~~~~~~
-!!! error TS2307: Cannot find external module 'module'.
+!!! error TS2307: Cannot find module 'module'.
import {c2} from "module"
~~~~~~~~
-!!! error TS2307: Cannot find external module 'module'.
+!!! error TS2307: Cannot find module 'module'.
import * as ns from "module"
~~~~~~~~
-!!! error TS2307: Cannot find external module 'module'.
+!!! error TS2307: Cannot find module 'module'.
class C extends c2.C {
}
@@ -24,5 +24,5 @@ tests/cases/compiler/separateCompilationImportExportElision.ts(12,18): error TS2
export {c1} from "module";
~~~~~~~~
-!!! error TS2307: Cannot find external module 'module'.
+!!! error TS2307: Cannot find module 'module'.
export var z = x;
\ No newline at end of file
diff --git a/tests/baselines/reference/separateCompilationNoExternalModule.errors.txt b/tests/baselines/reference/separateCompilationNoExternalModule.errors.txt
index 269727584d4..71d7da73a80 100644
--- a/tests/baselines/reference/separateCompilationNoExternalModule.errors.txt
+++ b/tests/baselines/reference/separateCompilationNoExternalModule.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/compiler/separateCompilationNoExternalModule.ts(2,1): error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
+tests/cases/compiler/separateCompilationNoExternalModule.ts(2,1): error TS1208: Cannot compile namespaces when the '--separateCompilation' flag is provided.
==== tests/cases/compiler/separateCompilationNoExternalModule.ts (1 errors) ====
var x;
~~~
-!!! error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
\ No newline at end of file
+!!! error TS1208: Cannot compile namespaces when the '--separateCompilation' flag is provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/separateCompilationOut.errors.txt b/tests/baselines/reference/separateCompilationOut.errors.txt
index 7c2631a7182..9017809901f 100644
--- a/tests/baselines/reference/separateCompilationOut.errors.txt
+++ b/tests/baselines/reference/separateCompilationOut.errors.txt
@@ -1,5 +1,5 @@
error TS5046: Option 'out' cannot be specified with option 'separateCompilation'.
-tests/cases/compiler/file2.ts(1,1): error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
+tests/cases/compiler/file2.ts(1,1): error TS1208: Cannot compile namespaces when the '--separateCompilation' flag is provided.
!!! error TS5046: Option 'out' cannot be specified with option 'separateCompilation'.
@@ -9,4 +9,4 @@ tests/cases/compiler/file2.ts(1,1): error TS1208: Cannot compile non-external mo
==== tests/cases/compiler/file2.ts (1 errors) ====
var y;
~~~
-!!! error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
\ No newline at end of file
+!!! error TS1208: Cannot compile namespaces when the '--separateCompilation' flag is provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/staticInstanceResolution5.errors.txt b/tests/baselines/reference/staticInstanceResolution5.errors.txt
index 3dea3485af9..3c1cee93fd5 100644
--- a/tests/baselines/reference/staticInstanceResolution5.errors.txt
+++ b/tests/baselines/reference/staticInstanceResolution5.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/compiler/staticInstanceResolution5_1.ts(1,24): error TS2307: Cannot find external module 'staticInstanceResolution5_0.ts'.
+tests/cases/compiler/staticInstanceResolution5_1.ts(1,24): error TS2307: Cannot find module 'staticInstanceResolution5_0.ts'.
==== tests/cases/compiler/staticInstanceResolution5_1.ts (1 errors) ====
import WinJS = require('staticInstanceResolution5_0.ts');
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module 'staticInstanceResolution5_0.ts'.
+!!! error TS2307: Cannot find module 'staticInstanceResolution5_0.ts'.
// these 3 should be errors
var x = (w1: WinJS) => { };
diff --git a/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.errors.txt b/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.errors.txt
index 408cf161f3c..7511e88f53a 100644
--- a/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.errors.txt
+++ b/tests/baselines/reference/strictModeReservedWordInImportEqualDeclaration.errors.txt
@@ -1,5 +1,5 @@
tests/cases/compiler/strictModeReservedWordInImportEqualDeclaration.ts(3,8): error TS1212: Identifier expected. 'public' is a reserved word in strict mode
-tests/cases/compiler/strictModeReservedWordInImportEqualDeclaration.ts(3,25): error TS2307: Cannot find external module '1'.
+tests/cases/compiler/strictModeReservedWordInImportEqualDeclaration.ts(3,25): error TS2307: Cannot find module '1'.
==== tests/cases/compiler/strictModeReservedWordInImportEqualDeclaration.ts (2 errors) ====
@@ -9,4 +9,4 @@ tests/cases/compiler/strictModeReservedWordInImportEqualDeclaration.ts(3,25): er
~~~~~~
!!! error TS1212: Identifier expected. 'public' is a reserved word in strict mode
~~~
-!!! error TS2307: Cannot find external module '1'.
\ No newline at end of file
+!!! error TS2307: Cannot find module '1'.
\ No newline at end of file
diff --git a/tests/baselines/reference/strictModeWordInImportDeclaration.errors.txt b/tests/baselines/reference/strictModeWordInImportDeclaration.errors.txt
index 83e44ab50b9..b5da09b4240 100644
--- a/tests/baselines/reference/strictModeWordInImportDeclaration.errors.txt
+++ b/tests/baselines/reference/strictModeWordInImportDeclaration.errors.txt
@@ -1,8 +1,8 @@
tests/cases/compiler/strictModeWordInImportDeclaration.ts(2,13): error TS1212: Identifier expected. 'package' is a reserved word in strict mode
-tests/cases/compiler/strictModeWordInImportDeclaration.ts(2,26): error TS2307: Cannot find external module './1'.
+tests/cases/compiler/strictModeWordInImportDeclaration.ts(2,26): error TS2307: Cannot find module './1'.
tests/cases/compiler/strictModeWordInImportDeclaration.ts(3,16): error TS1212: Identifier expected. 'private' is a reserved word in strict mode
-tests/cases/compiler/strictModeWordInImportDeclaration.ts(3,30): error TS2307: Cannot find external module './1'.
-tests/cases/compiler/strictModeWordInImportDeclaration.ts(4,20): error TS2307: Cannot find external module './1'.
+tests/cases/compiler/strictModeWordInImportDeclaration.ts(3,30): error TS2307: Cannot find module './1'.
+tests/cases/compiler/strictModeWordInImportDeclaration.ts(4,20): error TS2307: Cannot find module './1'.
==== tests/cases/compiler/strictModeWordInImportDeclaration.ts (5 errors) ====
@@ -11,12 +11,12 @@ tests/cases/compiler/strictModeWordInImportDeclaration.ts(4,20): error TS2307: C
~~~~~~~
!!! error TS1212: Identifier expected. 'package' is a reserved word in strict mode
~~~~~
-!!! error TS2307: Cannot find external module './1'.
+!!! error TS2307: Cannot find module './1'.
import {foo as private} from "./1"
~~~~~~~
!!! error TS1212: Identifier expected. 'private' is a reserved word in strict mode
~~~~~
-!!! error TS2307: Cannot find external module './1'.
+!!! error TS2307: Cannot find module './1'.
import public from "./1"
~~~~~
-!!! error TS2307: Cannot find external module './1'.
\ No newline at end of file
+!!! error TS2307: Cannot find module './1'.
\ No newline at end of file
diff --git a/tests/baselines/reference/thisInInvalidContexts.errors.txt b/tests/baselines/reference/thisInInvalidContexts.errors.txt
index 481c4747c99..055e0770dea 100644
--- a/tests/baselines/reference/thisInInvalidContexts.errors.txt
+++ b/tests/baselines/reference/thisInInvalidContexts.errors.txt
@@ -1,6 +1,6 @@
tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer.
tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(22,15): error TS2332: 'this' cannot be referenced in current location.
-tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(28,13): error TS2331: 'this' cannot be referenced in a module body.
+tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(28,13): error TS2331: 'this' cannot be referenced in a module or namespace body.
tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(38,25): error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(44,9): error TS2332: 'this' cannot be referenced in current location.
tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(45,9): error TS2332: 'this' cannot be referenced in current location.
@@ -40,7 +40,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(45,9):
//'this' in module variable
var x = this; // Error
~~~~
-!!! error TS2331: 'this' cannot be referenced in a module body.
+!!! error TS2331: 'this' cannot be referenced in a module or namespace body.
}
//'this' as type parameter constraint
diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt
index a8bf99de27b..03c494cad45 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt
@@ -1,10 +1,10 @@
tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer.
tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(22,15): error TS2332: 'this' cannot be referenced in current location.
-tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(28,13): error TS2331: 'this' cannot be referenced in a module body.
+tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(28,13): error TS2331: 'this' cannot be referenced in a module or namespace body.
tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(38,25): error TS9002: Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.
tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(44,9): error TS2332: 'this' cannot be referenced in current location.
tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(45,9): error TS2332: 'this' cannot be referenced in current location.
-tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(48,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(48,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts (7 errors) ====
@@ -41,7 +41,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod
//'this' in module variable
var x = this; // Error
~~~~
-!!! error TS2331: 'this' cannot be referenced in a module body.
+!!! error TS2331: 'this' cannot be referenced in a module or namespace body.
}
//'this' as type parameter constraint
@@ -69,4 +69,4 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod
export = this; // Should be an error
~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
\ No newline at end of file
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/thisInModule.errors.txt b/tests/baselines/reference/thisInModule.errors.txt
index d60bf51c1ba..5c4374b14a3 100644
--- a/tests/baselines/reference/thisInModule.errors.txt
+++ b/tests/baselines/reference/thisInModule.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/thisInModule.ts(3,5): error TS2331: 'this' cannot be referenced in a module body.
+tests/cases/compiler/thisInModule.ts(3,5): error TS2331: 'this' cannot be referenced in a module or namespace body.
==== tests/cases/compiler/thisInModule.ts (1 errors) ====
@@ -6,5 +6,5 @@ tests/cases/compiler/thisInModule.ts(3,5): error TS2331: 'this' cannot be refere
var x;
this.x = 5;
~~~~
-!!! error TS2331: 'this' cannot be referenced in a module body.
+!!! error TS2331: 'this' cannot be referenced in a module or namespace body.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/thisKeyword.errors.txt b/tests/baselines/reference/thisKeyword.errors.txt
index ba55df7bff3..facf52a3995 100644
--- a/tests/baselines/reference/thisKeyword.errors.txt
+++ b/tests/baselines/reference/thisKeyword.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/compiler/thisKeyword.ts(2,5): error TS2331: 'this' cannot be referenced in a module body.
+tests/cases/compiler/thisKeyword.ts(2,5): error TS2331: 'this' cannot be referenced in a module or namespace body.
==== tests/cases/compiler/thisKeyword.ts (1 errors) ====
module foo {
this.bar = 4;
~~~~
-!!! error TS2331: 'this' cannot be referenced in a module body.
+!!! error TS2331: 'this' cannot be referenced in a module or namespace body.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/topLevelFileModuleMissing.errors.txt b/tests/baselines/reference/topLevelFileModuleMissing.errors.txt
index ebeaf2e3474..7642bfd86a2 100644
--- a/tests/baselines/reference/topLevelFileModuleMissing.errors.txt
+++ b/tests/baselines/reference/topLevelFileModuleMissing.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/externalModules/foo_1.ts(1,22): error TS2307: Cannot find external module 'vs/foo'.
+tests/cases/conformance/externalModules/foo_1.ts(1,22): error TS2307: Cannot find module 'vs/foo'.
==== tests/cases/conformance/externalModules/foo_1.ts (1 errors) ====
import foo = require("vs/foo");
~~~~~~~~
-!!! error TS2307: Cannot find external module 'vs/foo'.
+!!! error TS2307: Cannot find module 'vs/foo'.
var z = foo.x + 10;
==== tests/cases/conformance/externalModules/vs/foo_0.ts (0 errors) ====
diff --git a/tests/baselines/reference/topLevelLambda.errors.txt b/tests/baselines/reference/topLevelLambda.errors.txt
index f83921cb5c8..c36864d243f 100644
--- a/tests/baselines/reference/topLevelLambda.errors.txt
+++ b/tests/baselines/reference/topLevelLambda.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/compiler/topLevelLambda.ts(2,17): error TS2331: 'this' cannot be referenced in a module body.
+tests/cases/compiler/topLevelLambda.ts(2,17): error TS2331: 'this' cannot be referenced in a module or namespace body.
==== tests/cases/compiler/topLevelLambda.ts (1 errors) ====
module M {
var f = () => {this.window;}
~~~~
-!!! error TS2331: 'this' cannot be referenced in a module body.
+!!! error TS2331: 'this' cannot be referenced in a module or namespace body.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/typeofANonExportedType.errors.txt b/tests/baselines/reference/typeofANonExportedType.errors.txt
index 9bcef8a3ded..b6b165cdd4f 100644
--- a/tests/baselines/reference/typeofANonExportedType.errors.txt
+++ b/tests/baselines/reference/typeofANonExportedType.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts(2,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts(2,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts (1 errors) ====
var x = 1;
export var r1: typeof x;
~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
var y = { foo: '' };
export var r2: typeof y;
class C {
diff --git a/tests/baselines/reference/typeofAnExportedType.errors.txt b/tests/baselines/reference/typeofAnExportedType.errors.txt
index dc23127aa05..9f64f697c08 100644
--- a/tests/baselines/reference/typeofAnExportedType.errors.txt
+++ b/tests/baselines/reference/typeofAnExportedType.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts(1,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided.
==== tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts (1 errors) ====
export var x = 1;
~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided.
export var r1: typeof x;
export var y = { foo: '' };
export var r2: typeof y;
diff --git a/tests/baselines/reference/umdDependencyComment2.errors.txt b/tests/baselines/reference/umdDependencyComment2.errors.txt
index 66c4adf4c1d..316bac0576c 100644
--- a/tests/baselines/reference/umdDependencyComment2.errors.txt
+++ b/tests/baselines/reference/umdDependencyComment2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/umdDependencyComment2.ts(3,21): error TS2307: Cannot find external module 'm2'.
+tests/cases/compiler/umdDependencyComment2.ts(3,21): error TS2307: Cannot find module 'm2'.
==== tests/cases/compiler/umdDependencyComment2.ts (1 errors) ====
@@ -6,6 +6,6 @@ tests/cases/compiler/umdDependencyComment2.ts(3,21): error TS2307: Cannot find e
import m1 = require("m2")
~~~~
-!!! error TS2307: Cannot find external module 'm2'.
+!!! error TS2307: Cannot find module 'm2'.
m1.f();
\ No newline at end of file
diff --git a/tests/baselines/reference/umdDependencyCommentName1.errors.txt b/tests/baselines/reference/umdDependencyCommentName1.errors.txt
index 6acb71c4b00..197753127d1 100644
--- a/tests/baselines/reference/umdDependencyCommentName1.errors.txt
+++ b/tests/baselines/reference/umdDependencyCommentName1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/umdDependencyCommentName1.ts(3,21): error TS2307: Cannot find external module 'm2'.
+tests/cases/compiler/umdDependencyCommentName1.ts(3,21): error TS2307: Cannot find module 'm2'.
==== tests/cases/compiler/umdDependencyCommentName1.ts (1 errors) ====
@@ -6,6 +6,6 @@ tests/cases/compiler/umdDependencyCommentName1.ts(3,21): error TS2307: Cannot fi
import m1 = require("m2")
~~~~
-!!! error TS2307: Cannot find external module 'm2'.
+!!! error TS2307: Cannot find module 'm2'.
m1.f();
\ No newline at end of file
diff --git a/tests/baselines/reference/umdDependencyCommentName2.errors.txt b/tests/baselines/reference/umdDependencyCommentName2.errors.txt
index 3481ca61148..d8920aed91b 100644
--- a/tests/baselines/reference/umdDependencyCommentName2.errors.txt
+++ b/tests/baselines/reference/umdDependencyCommentName2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/umdDependencyCommentName2.ts(5,21): error TS2307: Cannot find external module 'm2'.
+tests/cases/compiler/umdDependencyCommentName2.ts(5,21): error TS2307: Cannot find module 'm2'.
==== tests/cases/compiler/umdDependencyCommentName2.ts (1 errors) ====
@@ -8,6 +8,6 @@ tests/cases/compiler/umdDependencyCommentName2.ts(5,21): error TS2307: Cannot fi
import m1 = require("m2")
~~~~
-!!! error TS2307: Cannot find external module 'm2'.
+!!! error TS2307: Cannot find module 'm2'.
m1.f();
\ No newline at end of file
diff --git a/tests/baselines/reference/undeclaredModuleError.errors.txt b/tests/baselines/reference/undeclaredModuleError.errors.txt
index 62faef02eea..74e36318595 100644
--- a/tests/baselines/reference/undeclaredModuleError.errors.txt
+++ b/tests/baselines/reference/undeclaredModuleError.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/undeclaredModuleError.ts(1,21): error TS2307: Cannot find external module 'fs'.
+tests/cases/compiler/undeclaredModuleError.ts(1,21): error TS2307: Cannot find module 'fs'.
tests/cases/compiler/undeclaredModuleError.ts(8,29): error TS2345: Argument of type '() => void' is not assignable to parameter of type '(stat: any, name: string) => boolean'.
Type 'void' is not assignable to type 'boolean'.
tests/cases/compiler/undeclaredModuleError.ts(11,41): error TS2304: Cannot find name 'IDoNotExist'.
@@ -7,7 +7,7 @@ tests/cases/compiler/undeclaredModuleError.ts(11,41): error TS2304: Cannot find
==== tests/cases/compiler/undeclaredModuleError.ts (3 errors) ====
import fs = require('fs');
~~~~
-!!! error TS2307: Cannot find external module 'fs'.
+!!! error TS2307: Cannot find module 'fs'.
function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean, callback: (error: Error, results: { name: string; stat: fs.Stats; }[]) => void ) {}
function join(...paths: string[]) {}