Skip to content

Commit ee5881e

Browse files
mhegazymhegazy
committed
Merge branch 'master' into cleanHarnessOptionLoading
Conflicts: src/harness/harness.ts
2 parents 60e25a7 + 971c777 commit ee5881e

241 files changed

Lines changed: 6816 additions & 1560 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Jakefile.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ var harnessSources = harnessCoreSources.concat([
143143
"convertToBase64.ts",
144144
"transpile.ts",
145145
"reuseProgramStructure.ts",
146-
"cachingInServerLSHost.ts"
146+
"cachingInServerLSHost.ts",
147+
"moduleResolution.ts"
147148
].map(function (f) {
148149
return path.join(unittestsDirectory, f);
149150
})).concat([
@@ -587,9 +588,10 @@ function deleteTemporaryProjectOutput() {
587588
}
588589

589590
var testTimeout = 20000;
590-
desc("Runs the tests using the built run.js file. Syntax is jake runtests. Optional parameters 'host=', 'tests=[regex], reporter=[list|spec|json|<more>]'.");
591+
desc("Runs the tests using the built run.js file. Syntax is jake runtests. Optional parameters 'host=', 'tests=[regex], reporter=[list|spec|json|<more>]', debug=true.");
591592
task("runtests", ["tests", builtLocalDirectory], function() {
592593
cleanTestDirs();
594+
var debug = process.env.debug || process.env.d;
593595
host = "mocha"
594596
tests = process.env.test || process.env.tests || process.env.t;
595597
var light = process.env.light || false;
@@ -612,7 +614,7 @@ task("runtests", ["tests", builtLocalDirectory], function() {
612614
reporter = process.env.reporter || process.env.r || 'mocha-fivemat-progress-reporter';
613615
// timeout normally isn't necessary but Travis-CI has been timing out on compiler baselines occasionally
614616
// default timeout is 2sec which really should be enough, but maybe we just need a small amount longer
615-
var cmd = host + " -R " + reporter + tests + colors + ' -t ' + testTimeout + ' ' + run;
617+
var cmd = host + (debug ? " --debug-brk" : "") + " -R " + reporter + tests + colors + ' -t ' + testTimeout + ' ' + run;
616618
console.log(cmd);
617619
exec(cmd, deleteTemporaryProjectOutput);
618620
}, {async: true});

‎lib/lib.d.ts‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6929,6 +6929,7 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
69296929
webkitMatchesSelector(selectors: string): boolean;
69306930
webkitRequestFullScreen(): void;
69316931
webkitRequestFullscreen(): void;
6932+
getElementsByClassName(classNames: string): NodeListOf<Element>;
69326933
addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
69336934
addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
69346935
addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -7916,7 +7917,6 @@ interface HTMLElement extends Element {
79167917
contains(child: HTMLElement): boolean;
79177918
dragDrop(): boolean;
79187919
focus(): void;
7919-
getElementsByClassName(classNames: string): NodeListOf<Element>;
79207920
insertAdjacentElement(position: string, insertedElement: Element): Element;
79217921
insertAdjacentHTML(where: string, html: string): void;
79227922
insertAdjacentText(where: string, text: string): void;
@@ -11719,7 +11719,7 @@ interface MessageEvent extends Event {
1171911719

1172011720
declare var MessageEvent: {
1172111721
prototype: MessageEvent;
11722-
new(): MessageEvent;
11722+
new(type: string, eventInitDict?: MessageEventInit): MessageEvent;
1172311723
}
1172411724

1172511725
interface MessagePort extends EventTarget {
@@ -12461,7 +12461,7 @@ interface ProgressEvent extends Event {
1246112461

1246212462
declare var ProgressEvent: {
1246312463
prototype: ProgressEvent;
12464-
new(): ProgressEvent;
12464+
new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent;
1246512465
}
1246612466

1246712467
interface Range {
@@ -16628,7 +16628,6 @@ interface NodeListOf<TNode extends Node> extends NodeList {
1662816628
[index: number]: TNode;
1662916629
}
1663016630

16631-
1663216631
interface BlobPropertyBag {
1663316632
type?: string;
1663416633
endings?: string;
@@ -16645,6 +16644,21 @@ interface EventListenerObject {
1664516644

1664616645
declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
1664716646

16647+
interface MessageEventInit extends EventInit {
16648+
data?: any;
16649+
origin?: string;
16650+
lastEventId?: string;
16651+
channel?: string;
16652+
source?: any;
16653+
ports?: MessagePort[];
16654+
}
16655+
16656+
interface ProgressEventInit extends EventInit {
16657+
lengthComputable?: boolean;
16658+
loaded?: number;
16659+
total?: number;
16660+
}
16661+
1664816662
interface ErrorEventHandler {
1664916663
(message: string, filename?: string, lineno?: number, colno?: number, error?:Error): void;
1665016664
}
@@ -16974,8 +16988,7 @@ declare function addEventListener(type: "unload", listener: (ev: Event) => any,
1697416988
declare function addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
1697516989
declare function addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
1697616990
declare function addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
16977-
declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
16978-
16991+
declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
1697916992
/////////////////////////////
1698016993
/// WorkerGlobalScope APIs
1698116994
/////////////////////////////

‎lib/lib.dom.d.ts‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3105,6 +3105,7 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
31053105
webkitMatchesSelector(selectors: string): boolean;
31063106
webkitRequestFullScreen(): void;
31073107
webkitRequestFullscreen(): void;
3108+
getElementsByClassName(classNames: string): NodeListOf<Element>;
31083109
addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
31093110
addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
31103111
addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -4092,7 +4093,6 @@ interface HTMLElement extends Element {
40924093
contains(child: HTMLElement): boolean;
40934094
dragDrop(): boolean;
40944095
focus(): void;
4095-
getElementsByClassName(classNames: string): NodeListOf<Element>;
40964096
insertAdjacentElement(position: string, insertedElement: Element): Element;
40974097
insertAdjacentHTML(where: string, html: string): void;
40984098
insertAdjacentText(where: string, text: string): void;
@@ -7895,7 +7895,7 @@ interface MessageEvent extends Event {
78957895

78967896
declare var MessageEvent: {
78977897
prototype: MessageEvent;
7898-
new(): MessageEvent;
7898+
new(type: string, eventInitDict?: MessageEventInit): MessageEvent;
78997899
}
79007900

79017901
interface MessagePort extends EventTarget {
@@ -8637,7 +8637,7 @@ interface ProgressEvent extends Event {
86378637

86388638
declare var ProgressEvent: {
86398639
prototype: ProgressEvent;
8640-
new(): ProgressEvent;
8640+
new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent;
86418641
}
86428642

86438643
interface Range {
@@ -12804,7 +12804,6 @@ interface NodeListOf<TNode extends Node> extends NodeList {
1280412804
[index: number]: TNode;
1280512805
}
1280612806

12807-
1280812807
interface BlobPropertyBag {
1280912808
type?: string;
1281012809
endings?: string;
@@ -12821,6 +12820,21 @@ interface EventListenerObject {
1282112820

1282212821
declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
1282312822

12823+
interface MessageEventInit extends EventInit {
12824+
data?: any;
12825+
origin?: string;
12826+
lastEventId?: string;
12827+
channel?: string;
12828+
source?: any;
12829+
ports?: MessagePort[];
12830+
}
12831+
12832+
interface ProgressEventInit extends EventInit {
12833+
lengthComputable?: boolean;
12834+
loaded?: number;
12835+
total?: number;
12836+
}
12837+
1282412838
interface ErrorEventHandler {
1282512839
(message: string, filename?: string, lineno?: number, colno?: number, error?:Error): void;
1282612840
}
@@ -13150,4 +13164,4 @@ declare function addEventListener(type: "unload", listener: (ev: Event) => any,
1315013164
declare function addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
1315113165
declare function addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
1315213166
declare function addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
13153-
declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
13167+
declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;

‎lib/lib.es6.d.ts‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8217,6 +8217,7 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
82178217
webkitMatchesSelector(selectors: string): boolean;
82188218
webkitRequestFullScreen(): void;
82198219
webkitRequestFullscreen(): void;
8220+
getElementsByClassName(classNames: string): NodeListOf<Element>;
82208221
addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
82218222
addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
82228223
addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -9204,7 +9205,6 @@ interface HTMLElement extends Element {
92049205
contains(child: HTMLElement): boolean;
92059206
dragDrop(): boolean;
92069207
focus(): void;
9207-
getElementsByClassName(classNames: string): NodeListOf<Element>;
92089208
insertAdjacentElement(position: string, insertedElement: Element): Element;
92099209
insertAdjacentHTML(where: string, html: string): void;
92109210
insertAdjacentText(where: string, text: string): void;
@@ -13007,7 +13007,7 @@ interface MessageEvent extends Event {
1300713007

1300813008
declare var MessageEvent: {
1300913009
prototype: MessageEvent;
13010-
new(): MessageEvent;
13010+
new(type: string, eventInitDict?: MessageEventInit): MessageEvent;
1301113011
}
1301213012

1301313013
interface MessagePort extends EventTarget {
@@ -13749,7 +13749,7 @@ interface ProgressEvent extends Event {
1374913749

1375013750
declare var ProgressEvent: {
1375113751
prototype: ProgressEvent;
13752-
new(): ProgressEvent;
13752+
new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent;
1375313753
}
1375413754

1375513755
interface Range {
@@ -17916,7 +17916,6 @@ interface NodeListOf<TNode extends Node> extends NodeList {
1791617916
[index: number]: TNode;
1791717917
}
1791817918

17919-
1792017919
interface BlobPropertyBag {
1792117920
type?: string;
1792217921
endings?: string;
@@ -17933,6 +17932,21 @@ interface EventListenerObject {
1793317932

1793417933
declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
1793517934

17935+
interface MessageEventInit extends EventInit {
17936+
data?: any;
17937+
origin?: string;
17938+
lastEventId?: string;
17939+
channel?: string;
17940+
source?: any;
17941+
ports?: MessagePort[];
17942+
}
17943+
17944+
interface ProgressEventInit extends EventInit {
17945+
lengthComputable?: boolean;
17946+
loaded?: number;
17947+
total?: number;
17948+
}
17949+
1793617950
interface ErrorEventHandler {
1793717951
(message: string, filename?: string, lineno?: number, colno?: number, error?:Error): void;
1793817952
}
@@ -18262,8 +18276,7 @@ declare function addEventListener(type: "unload", listener: (ev: Event) => any,
1826218276
declare function addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
1826318277
declare function addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
1826418278
declare function addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
18265-
declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
18266-
interface DOMTokenList {
18279+
declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;interface DOMTokenList {
1826718280
[Symbol.iterator](): IterableIterator<string>;
1826818281
}
1826918282

‎lib/lib.webworker.d.ts‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ interface MessageEvent extends Event {
776776

777777
declare var MessageEvent: {
778778
prototype: MessageEvent;
779-
new(): MessageEvent;
779+
new(type: string, eventInitDict?: MessageEventInit): MessageEvent;
780780
}
781781

782782
interface MessagePort extends EventTarget {
@@ -829,7 +829,7 @@ interface ProgressEvent extends Event {
829829

830830
declare var ProgressEvent: {
831831
prototype: ProgressEvent;
832-
new(): ProgressEvent;
832+
new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent;
833833
}
834834

835835
interface WebSocket extends EventTarget {
@@ -1100,6 +1100,21 @@ interface EventListenerObject {
11001100

11011101
declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
11021102

1103+
interface MessageEventInit extends EventInit {
1104+
data?: any;
1105+
origin?: string;
1106+
lastEventId?: string;
1107+
channel?: string;
1108+
source?: any;
1109+
ports?: MessagePort[];
1110+
}
1111+
1112+
interface ProgressEventInit extends EventInit {
1113+
lengthComputable?: boolean;
1114+
loaded?: number;
1115+
total?: number;
1116+
}
1117+
11031118
interface ErrorEventHandler {
11041119
(message: string, filename?: string, lineno?: number, colno?: number, error?:Error): void;
11051120
}
@@ -1156,4 +1171,4 @@ declare function postMessage(data: any): void;
11561171
declare var console: Console;
11571172
declare function addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
11581173
declare function addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
1159-
declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
1174+
declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;

0 commit comments

Comments
 (0)