diff --git a/package.json b/package.json index e0952e0b..accd39fd 100644 --- a/package.json +++ b/package.json @@ -28,19 +28,19 @@ }, "homepage": "https://github.com/adonisjs/adonis-lucid#readme", "dependencies": { - "@poppinss/logger": "^1.1.2", - "@poppinss/profiler": "^1.1.0", + "@poppinss/logger": "^1.1.3", + "@poppinss/profiler": "^1.1.1", "@poppinss/traits": "^1.0.0", - "@poppinss/utils": "^1.0.4", - "knex": "^0.19.2", + "@poppinss/utils": "^1.0.5", + "knex": "^0.19.3", "knex-dynamic-connection": "^1.0.0", "ts-essentials": "^3.0.2" }, "devDependencies": { - "@adonisjs/mrm-preset": "^2.0.3", - "@poppinss/dev-utils": "^1.0.0", + "@adonisjs/mrm-preset": "^2.1.0", + "@poppinss/dev-utils": "^1.0.1", "@types/dotenv": "^6.1.1", - "@types/node": "^12.7.2", + "@types/node": "^12.7.3", "clone": "^2.1.2", "commitizen": "^4.0.3", "cz-conventional-changelog": "^3.0.2", @@ -48,16 +48,16 @@ "doctoc": "^1.4.0", "dotenv": "^8.1.0", "husky": "^3.0.4", - "japa": "^2.0.10", + "japa": "^3.0.0", "mrm": "^1.2.2", "mysql": "^2.17.1", "pg": "^7.12.1", "pkg-ok": "^2.3.1", "sqlite3": "^4.1.0", "ts-node": "^8.3.0", - "tslint": "^5.18.0", + "tslint": "^5.19.0", "tslint-eslint-rules": "^5.4.0", - "typescript": "^3.5.3" + "typescript": "^3.6.2" }, "publishConfig": { "tag": "next", diff --git a/src/Connection/index.ts b/src/Connection/index.ts index a3dc19af..7445afd0 100644 --- a/src/Connection/index.ts +++ b/src/Connection/index.ts @@ -9,8 +9,8 @@ /// +import knex from 'knex' import { Pool } from 'tarn' -import * as knex from 'knex' import { EventEmitter } from 'events' import { Exception } from '@poppinss/utils' import { LoggerContract } from '@poppinss/logger' diff --git a/src/Database/QueryBuilder/Chainable.ts b/src/Database/QueryBuilder/Chainable.ts index 045a205e..3dcda277 100644 --- a/src/Database/QueryBuilder/Chainable.ts +++ b/src/Database/QueryBuilder/Chainable.ts @@ -9,7 +9,7 @@ /// -import * as knex from 'knex' +import knex from 'knex' import { ChainableContract, QueryCallback } from '@ioc:Adonis/Lucid/DatabaseQueryBuilder' import { RawQueryBuilder } from './Raw' diff --git a/src/Database/QueryBuilder/Database.ts b/src/Database/QueryBuilder/Database.ts index abfab2b2..4e567e90 100644 --- a/src/Database/QueryBuilder/Database.ts +++ b/src/Database/QueryBuilder/Database.ts @@ -9,7 +9,7 @@ /// -import * as knex from 'knex' +import knex from 'knex' import { Exception } from '@poppinss/utils' import { trait } from '@poppinss/traits' diff --git a/src/Database/QueryBuilder/Insert.ts b/src/Database/QueryBuilder/Insert.ts index 70ed24cf..58b59f1f 100644 --- a/src/Database/QueryBuilder/Insert.ts +++ b/src/Database/QueryBuilder/Insert.ts @@ -9,7 +9,7 @@ /// -import * as knex from 'knex' +import knex from 'knex' import { trait } from '@poppinss/traits' import { QueryClientContract } from '@ioc:Adonis/Lucid/Database' diff --git a/src/Database/QueryBuilder/Raw.ts b/src/Database/QueryBuilder/Raw.ts index d779b4be..04250ded 100644 --- a/src/Database/QueryBuilder/Raw.ts +++ b/src/Database/QueryBuilder/Raw.ts @@ -9,7 +9,7 @@ /// -import * as knex from 'knex' +import knex from 'knex' import { trait } from '@poppinss/traits' import { QueryClientContract } from '@ioc:Adonis/Lucid/Database' diff --git a/src/Database/QueryClient/index.ts b/src/Database/QueryClient/index.ts index ffa27d52..be60cdb2 100644 --- a/src/Database/QueryClient/index.ts +++ b/src/Database/QueryClient/index.ts @@ -9,7 +9,7 @@ /// -import * as knex from 'knex' +import knex from 'knex' import { Exception } from '@poppinss/utils' import { resolveClientNameWithAliases } from 'knex/lib/helpers' import { ProfilerRowContract, ProfilerContract } from '@poppinss/profiler' diff --git a/src/Database/TransactionClient/index.ts b/src/Database/TransactionClient/index.ts index d200bf3d..14e86ce7 100644 --- a/src/Database/TransactionClient/index.ts +++ b/src/Database/TransactionClient/index.ts @@ -9,7 +9,7 @@ /// -import * as knex from 'knex' +import knex from 'knex' import { TransactionClientContract } from '@ioc:Adonis/Lucid/Database' import { ProfilerRowContract, ProfilerContract } from '@poppinss/profiler' diff --git a/test-helpers/index.ts b/test-helpers/index.ts index 03e27dfd..c28f5d4b 100644 --- a/test-helpers/index.ts +++ b/test-helpers/index.ts @@ -10,8 +10,8 @@ /// import { join } from 'path' -import * as knex from 'knex' -import * as dotenv from 'dotenv' +import knex from 'knex' +import dotenv from 'dotenv' import { FakeLogger } from '@poppinss/logger' import { Profiler } from '@poppinss/profiler' import { Filesystem } from '@poppinss/dev-utils' diff --git a/test/connection-manager.spec.ts b/test/connection-manager.spec.ts index 2b73ff13..d2cccf56 100644 --- a/test/connection-manager.spec.ts +++ b/test/connection-manager.spec.ts @@ -9,7 +9,7 @@ /// -import * as test from 'japa' +import test from 'japa' import { ConnectionManager } from '../src/Connection/Manager' import { getConfig, setup, cleanup, getLogger } from '../test-helpers' diff --git a/test/connection.spec.ts b/test/connection.spec.ts index 21df5f11..f558ef5e 100644 --- a/test/connection.spec.ts +++ b/test/connection.spec.ts @@ -9,7 +9,7 @@ /// -import * as test from 'japa' +import test from 'japa' import { MysqlConfigContract } from '@ioc:Adonis/Lucid/Database' import { Connection } from '../src/Connection' diff --git a/test/database.spec.ts b/test/database.spec.ts index f53cf53c..69135b32 100644 --- a/test/database.spec.ts +++ b/test/database.spec.ts @@ -9,7 +9,7 @@ /// -import * as test from 'japa' +import test from 'japa' import { Database } from '../src/Database' import { getConfig, setup, cleanup, getLogger, getProfiler } from '../test-helpers' diff --git a/test/insert-query-builder.spec.ts b/test/insert-query-builder.spec.ts index 3a642c7f..eb9c33a4 100644 --- a/test/insert-query-builder.spec.ts +++ b/test/insert-query-builder.spec.ts @@ -9,7 +9,7 @@ /// -import * as test from 'japa' +import test from 'japa' import { Connection } from '../src/Connection' import { getConfig, setup, cleanup, getInsertBuilder, getLogger } from '../test-helpers' diff --git a/test/query-builder.spec.ts b/test/query-builder.spec.ts index ec3aa751..e0a6960e 100644 --- a/test/query-builder.spec.ts +++ b/test/query-builder.spec.ts @@ -9,7 +9,7 @@ /// -import * as test from 'japa' +import test from 'japa' import { Connection } from '../src/Connection' import { DatabaseQueryBuilder } from '../src/Database/QueryBuilder/Database' import { diff --git a/test/query-client.spec.ts b/test/query-client.spec.ts index 99c1cf54..298e6be8 100644 --- a/test/query-client.spec.ts +++ b/test/query-client.spec.ts @@ -9,7 +9,7 @@ /// -import * as test from 'japa' +import test from 'japa' import { Connection } from '../src/Connection' import { getConfig, setup, cleanup, getLogger } from '../test-helpers' diff --git a/test/transactions.spec.ts b/test/transactions.spec.ts index d617a505..a26df98e 100644 --- a/test/transactions.spec.ts +++ b/test/transactions.spec.ts @@ -9,7 +9,7 @@ /// -import * as test from 'japa' +import test from 'japa' import { Connection } from '../src/Connection' import { getConfig, setup, cleanup, resetTables, getLogger } from '../test-helpers'