From d491a301e578d57a1c7c769098efcebc797c4bef Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 15 Sep 2015 11:44:12 -0700
Subject: [PATCH] Breaking changes from node resolution changes. ambient module
 declarations do not take precedance any longer.

---
 ...eRefernceResolutionOrderInImportDeclaration.errors.txt | 8 ++++----
 ...nalModuleRefernceResolutionOrderInImportDeclaration.js | 4 ++--
 .../reference/topLevelModuleDeclarationAndFile.errors.txt | 2 +-
 .../reference/topLevelModuleDeclarationAndFile.js         | 4 +---
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.errors.txt b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.errors.txt
index 588183c6283..a0b34ecbee1 100644
--- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.errors.txt
+++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.errors.txt
@@ -1,13 +1,13 @@
-tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file3.ts(3,7): error TS2339: Property 'foo' does not exist on type 'typeof "externalModuleRefernceResolutionOrderInImportDeclaration_file1"'.
+tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file3.ts(4,7): error TS2339: Property 'bar' does not exist on type 'typeof "tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file1"'.
 
 
 ==== tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file3.ts (1 errors) ====
     ///<reference path='externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts'/>
-    import file1 = require('externalModuleRefernceResolutionOrderInImportDeclaration_file1');
+    import file1 = require('./externalModuleRefernceResolutionOrderInImportDeclaration_file1');
     file1.foo();
-          ~~~
-!!! error TS2339: Property 'foo' does not exist on type 'typeof "externalModuleRefernceResolutionOrderInImportDeclaration_file1"'.
     file1.bar();
+          ~~~
+!!! error TS2339: Property 'bar' does not exist on type 'typeof "tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file1"'.
     
     
 ==== tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file1.ts (0 errors) ====
diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
index f1d1d9fb561..48411da4a02 100644
--- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
+++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
@@ -11,7 +11,7 @@ declare module "externalModuleRefernceResolutionOrderInImportDeclaration_file1"
 
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file3.ts]
 ///<reference path='externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts'/>
-import file1 = require('externalModuleRefernceResolutionOrderInImportDeclaration_file1');
+import file1 = require('./externalModuleRefernceResolutionOrderInImportDeclaration_file1');
 file1.foo();
 file1.bar();
 
@@ -24,6 +24,6 @@ exports.foo = foo;
 ;
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file3.js]
 ///<reference path='externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts'/>
-var file1 = require('externalModuleRefernceResolutionOrderInImportDeclaration_file1');
+var file1 = require('./externalModuleRefernceResolutionOrderInImportDeclaration_file1');
 file1.foo();
 file1.bar();
diff --git a/tests/baselines/reference/topLevelModuleDeclarationAndFile.errors.txt b/tests/baselines/reference/topLevelModuleDeclarationAndFile.errors.txt
index de343803529..cb555b7a603 100644
--- a/tests/baselines/reference/topLevelModuleDeclarationAndFile.errors.txt
+++ b/tests/baselines/reference/topLevelModuleDeclarationAndFile.errors.txt
@@ -9,7 +9,7 @@ tests/cases/conformance/externalModules/foo_2.ts(3,14): error TS2339: Property '
 !!! error TS2339: Property 'x' does not exist on type 'typeof "vs/foo_0"'.
     var z2 = foo.y() + 10; // Should resolve
     
-==== tests/cases/conformance/externalModules/vs/foo_0.ts (0 errors) ====
+==== tests/cases/conformance/externalModules/vs/foo_0/index.ts (0 errors) ====
     export var x: number = 42;
     
 ==== tests/cases/conformance/externalModules/foo_1.ts (0 errors) ====
diff --git a/tests/baselines/reference/topLevelModuleDeclarationAndFile.js b/tests/baselines/reference/topLevelModuleDeclarationAndFile.js
index c47de516108..e223a293d7c 100644
--- a/tests/baselines/reference/topLevelModuleDeclarationAndFile.js
+++ b/tests/baselines/reference/topLevelModuleDeclarationAndFile.js
@@ -1,6 +1,6 @@
 //// [tests/cases/conformance/externalModules/topLevelModuleDeclarationAndFile.ts] ////
 
-//// [foo_0.ts]
+//// [index.ts]
 export var x: number = 42;
 
 //// [foo_1.ts]
@@ -17,8 +17,6 @@ var z2 = foo.y() + 10; // Should resolve
 
 
 //// [foo_1.js]
-//// [foo_0.js]
-exports.x = 42;
 //// [foo_2.js]
 /// <reference path="foo_1.ts"/>
 var foo = require("vs/foo_0");