From b2f92ad96759e0e9aa7fa6ff2c158362c0686cc0 Mon Sep 17 00:00:00 2001 From: Jeff Kenney Date: Wed, 25 Jan 2017 09:42:31 -0800 Subject: [PATCH 1/2] knex: reference correct Promise implementation --- knex/index.d.ts | 1 + knex/knex-tests.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/knex/index.d.ts b/knex/index.d.ts index 55ef48a05e..910bab9d04 100644 --- a/knex/index.d.ts +++ b/knex/index.d.ts @@ -7,6 +7,7 @@ /// import * as events from "events"; +import * as Promise from "bluebird"; type Callback = Function; type Client = Function; diff --git a/knex/knex-tests.ts b/knex/knex-tests.ts index 8fd9cc971c..8c1878760b 100644 --- a/knex/knex-tests.ts +++ b/knex/knex-tests.ts @@ -1,5 +1,6 @@ "use strict"; import * as Knex from 'knex'; +import * as Promise from 'bluebird'; import * as _ from 'lodash'; // Initializing the Library From fbe1aee12d05e849bb728896a20b1b30e53758f8 Mon Sep 17 00:00:00 2001 From: Jeff Kenney Date: Wed, 25 Jan 2017 11:58:55 -0800 Subject: [PATCH 2/2] knex: use import = require() syntax --- knex/index.d.ts | 4 ++-- knex/knex-tests.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/knex/index.d.ts b/knex/index.d.ts index 910bab9d04..5196f47eb0 100644 --- a/knex/index.d.ts +++ b/knex/index.d.ts @@ -6,8 +6,8 @@ /// /// -import * as events from "events"; -import * as Promise from "bluebird"; +import events = require("events"); +import Promise = require("bluebird"); type Callback = Function; type Client = Function; diff --git a/knex/knex-tests.ts b/knex/knex-tests.ts index 8c1878760b..420aafd724 100644 --- a/knex/knex-tests.ts +++ b/knex/knex-tests.ts @@ -1,7 +1,7 @@ "use strict"; -import * as Knex from 'knex'; -import * as Promise from 'bluebird'; -import * as _ from 'lodash'; +import Knex = require('knex'); +import Promise = require('bluebird'); +import _ = require('lodash'); // Initializing the Library var knex = Knex({