Merge pull request #4 from DefinitelyTyped/master

update fork

types/luxon/index.d.ts

@@ -287,7 +287,7 @@ declare module 'luxon' {
         type Features = {
             intl: boolean;
             intlTokens: boolean;
-            timezones: boolean;
+            zones: boolean;
         };
 
         namespace Info {

types/luxon/luxon-tests.ts

@@ -78,6 +78,9 @@ i.toString();
 /* Info */
 Info.months();
 Info.weekdays('long');
+Info.features().intl;
+Info.features().intlTokens;
+Info.features().zones;
 
 /* Settings */
 Settings.defaultLocale;

types/stompjs/index.d.ts

@@ -1,6 +1,6 @@
 // Type definitions for stompjs 2.3
 // Project: https://github.com/jmesnil/stomp-websocket
-// Definitions by: Jimi Charalampidis <https://github.com/jimic>
+// Definitions by: Jimi Charalampidis <https://github.com/jimic>, Stefan Erichsen <https://github.com/Dr4k4n>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -13,7 +13,6 @@ export const VERSIONS: {
 };
 
 export class Client {
-
     connected: boolean;
     counter: number;
     heartbeat: {
@@ -51,9 +50,14 @@ export interface Message {
     nack(headers?: {}): any;
 }
 
-export class Frame {
+export class Frame implements Message {
+    command: string;
+    headers: {};
+    body: string;
     constructor(command: string, headers?: {}, body?: string);
 
+    ack(headers?: {}): any;
+    nack(headers?: {}): any;
     toString(): string;
     sizeOfUTF8(s: string): number;
     unmarshall(datas: any): any;

types/stompjs/stompjs-tests.ts

@@ -43,6 +43,11 @@ client.connect('user', 'pass', () => { }, (error) => { });
 client.connect('user', 'pass', () => { }, (error) => { }, 'host');
 client.connect('user', 'pass', (frame) => { }, (error) => { });
 client.connect('user', 'pass', (frame) => { }, (error) => { }, 'host');
+client.connect('user', 'pass', (frame) => {
+    if (!!frame) {
+        frame.command;
+    }
+ }, (error) => { }, 'host');
 
 client.disconnect(() => { });
 client.disconnect(() => { }, {});