Accept baseline changes

This commit is contained in:
Mohamed Hegazy 2015-03-23 12:47:39 -07:00
parent d47445b175
commit d2ead15767
5 changed files with 42 additions and 42 deletions

View file

@ -11,25 +11,25 @@ tests/cases/compiler/main.ts(33,8): error TS1192: External module '"function"' h
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 TS2496: External module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
tests/cases/compiler/main.ts(45,21): error TS2496: External module '"function"' resolves to a non-module entity and cannot be imported using this construct.
tests/cases/compiler/main.ts(47,21): error TS2496: External module '"class"' resolves to a non-module entity and cannot be imported using this construct.
tests/cases/compiler/main.ts(62,25): error TS2496: External module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
tests/cases/compiler/main.ts(68,25): error TS2496: External module '"function"' resolves to a non-module entity and cannot be imported using this construct.
tests/cases/compiler/main.ts(70,25): error TS2496: External module '"class"' resolves to a non-module entity and cannot be imported using this construct.
tests/cases/compiler/main.ts(85,25): error TS2496: External module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
tests/cases/compiler/main.ts(91,25): error TS2496: External module '"function"' resolves to a non-module entity and cannot be imported using this construct.
tests/cases/compiler/main.ts(93,25): error TS2496: External module '"class"' resolves to a non-module entity and cannot be imported using this construct.
tests/cases/compiler/main.ts(97,15): error TS2497: External module '"interface"' uses 'export =' and cannot be used with 'export *'.
tests/cases/compiler/main.ts(98,15): error TS2497: External module '"variable"' uses 'export =' and cannot be used with 'export *'.
tests/cases/compiler/main.ts(99,15): error TS2497: External module '"interface-variable"' uses 'export =' and cannot be used with 'export *'.
tests/cases/compiler/main.ts(100,15): error TS2497: External module '"module"' uses 'export =' and cannot be used with 'export *'.
tests/cases/compiler/main.ts(101,15): error TS2497: External module '"interface-module"' uses 'export =' and cannot be used with 'export *'.
tests/cases/compiler/main.ts(102,15): error TS2497: External module '"variable-module"' uses 'export =' and cannot be used with 'export *'.
tests/cases/compiler/main.ts(103,15): error TS2497: External module '"function"' uses 'export =' and cannot be used with 'export *'.
tests/cases/compiler/main.ts(104,15): error TS2497: External module '"function-module"' uses 'export =' and cannot be used with 'export *'.
tests/cases/compiler/main.ts(105,15): error TS2497: External module '"class"' uses 'export =' and cannot be used with 'export *'.
tests/cases/compiler/main.ts(106,15): error TS2497: External module '"class-module"' uses 'export =' and cannot be used with '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 (32 errors) ====
@ -99,7 +99,7 @@ tests/cases/compiler/main.ts(106,15): error TS2497: External module '"class-modu
// namespace import
import * as y1 from "interface";
~~~~~~~~~~~
!!! error TS2496: External module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
!!! error TS2497: External 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 TS2497: External module '"class-modu
import * as y6 from "variable-module";
import * as y7 from "function";
~~~~~~~~~~
!!! error TS2496: External module '"function"' resolves to a non-module entity and cannot be imported using this construct.
!!! error TS2497: External 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 TS2496: External module '"class"' resolves to a non-module entity and cannot be imported using this construct.
!!! error TS2497: External 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 TS2497: External module '"class-modu
// named import
import { a as a1 } from "interface";
~~~~~~~~~~~
!!! error TS2496: External module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
!!! error TS2497: External 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 TS2497: External module '"class-modu
import { a as a6 } from "variable-module";
import { a as a7 } from "function";
~~~~~~~~~~
!!! error TS2496: External module '"function"' resolves to a non-module entity and cannot be imported using this construct.
!!! error TS2497: External 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 TS2496: External module '"class"' resolves to a non-module entity and cannot be imported using this construct.
!!! error TS2497: External 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 TS2497: External module '"class-modu
// named export
export { a as a1 } from "interface";
~~~~~~~~~~~
!!! error TS2496: External module '"interface"' resolves to a non-module entity and cannot be imported using this construct.
!!! error TS2497: External 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 TS2497: External module '"class-modu
export { a as a6 } from "variable-module";
export { a as a7 } from "function";
~~~~~~~~~~
!!! error TS2496: External module '"function"' resolves to a non-module entity and cannot be imported using this construct.
!!! error TS2497: External 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 TS2496: External module '"class"' resolves to a non-module entity and cannot be imported using this construct.
!!! error TS2497: External 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 TS2497: External module '"interface"' uses 'export =' and cannot be used with 'export *'.
!!! error TS2498: External module '"interface"' uses 'export =' and cannot be used with 'export *'.
export * from "variable";
~~~~~~~~~~
!!! error TS2497: External module '"variable"' uses 'export =' and cannot be used with 'export *'.
!!! error TS2498: External module '"variable"' uses 'export =' and cannot be used with 'export *'.
export * from "interface-variable";
~~~~~~~~~~~~~~~~~~~~
!!! error TS2497: External module '"interface-variable"' uses 'export =' and cannot be used with 'export *'.
!!! error TS2498: External module '"interface-variable"' uses 'export =' and cannot be used with 'export *'.
export * from "module";
~~~~~~~~
!!! error TS2497: External module '"module"' uses 'export =' and cannot be used with 'export *'.
!!! error TS2498: External module '"module"' uses 'export =' and cannot be used with 'export *'.
export * from "interface-module";
~~~~~~~~~~~~~~~~~~
!!! error TS2497: External module '"interface-module"' uses 'export =' and cannot be used with 'export *'.
!!! error TS2498: External module '"interface-module"' uses 'export =' and cannot be used with 'export *'.
export * from "variable-module";
~~~~~~~~~~~~~~~~~
!!! error TS2497: External module '"variable-module"' uses 'export =' and cannot be used with 'export *'.
!!! error TS2498: External module '"variable-module"' uses 'export =' and cannot be used with 'export *'.
export * from "function";
~~~~~~~~~~
!!! error TS2497: External module '"function"' uses 'export =' and cannot be used with 'export *'.
!!! error TS2498: External module '"function"' uses 'export =' and cannot be used with 'export *'.
export * from "function-module";
~~~~~~~~~~~~~~~~~
!!! error TS2497: External module '"function-module"' uses 'export =' and cannot be used with 'export *'.
!!! error TS2498: External module '"function-module"' uses 'export =' and cannot be used with 'export *'.
export * from "class";
~~~~~~~
!!! error TS2497: External module '"class"' uses 'export =' and cannot be used with 'export *'.
!!! error TS2498: External module '"class"' uses 'export =' and cannot be used with 'export *'.
export * from "class-module";
~~~~~~~~~~~~~~
!!! error TS2497: External module '"class-module"' uses 'export =' and cannot be used with 'export *'.
!!! error TS2498: External module '"class-module"' uses 'export =' and cannot be used with 'export *'.
==== tests/cases/compiler/modules.d.ts (0 errors) ====

View file

@ -13,7 +13,7 @@ var x: number = defaultBinding;
var a = 10;
exports.default = a;
//// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
var nameSpaceBinding = require("es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
var _es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0 = require("es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"), nameSpaceBinding = _es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0;
var x = _es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.default;

View file

@ -16,7 +16,7 @@ var a = (function () {
})();
exports.a = a;
//// [client.js]
var nameSpaceBinding = require("server");
var _server = require("server"), nameSpaceBinding = _server;
exports.x = new nameSpaceBinding.a();

View file

@ -11,7 +11,7 @@ var x: number = nameSpaceBinding.a;
//// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
exports.a = 10;
//// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
var nameSpaceBinding = require("es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
var _es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0 = require("es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"), nameSpaceBinding = _es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0;
var x = nameSpaceBinding.a;

View file

@ -11,7 +11,7 @@ export var x: number = nameSpaceBinding.a;
//// [server.js]
exports.a = 10;
//// [client.js]
var nameSpaceBinding = require("server");
var _server = require("server"), nameSpaceBinding = _server;
exports.x = nameSpaceBinding.a;