fix(deps): update dependency knex to ^0.95.11 (#837)

* fix(deps): update dependency knex to ^0.95.11 * Changes Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Nathan Bierema <[email protected]>
reduxjs · Oct 25, 2021 · 0400e0c · 0400e0c
1 parent 503be15
commit 0400e0c
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 328 deletions.
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -22,10 +22,9 @@ packageExtensions:
   'apollo-server-core@^3.4.0':
     dependencies:
       '@types/node': '^14.17.15'
-  'knex@^0.19.5':
+  'tarn@^3.0.1':
     dependencies:
       '@types/node': '^14.17.15'
-      'sqlite3': '^5.0.2'
   '@chakra-ui/switch@^1.2.10':
     peerDependencies:
       'framer-motion': '3.x || 4.x'

diff --git a/packages/redux-devtools-cli/package.json b/packages/redux-devtools-cli/package.json
@@ -51,7 +51,7 @@
     "express": "^4.17.1",
     "getport": "^0.1.0",
     "graphql": "^15.6.1",
-    "knex": "^0.19.5",
+    "knex": "^0.95.11",
     "lodash": "^4.17.21",
     "minimist": "^1.2.5",
     "morgan": "^1.10.0",

diff --git a/packages/redux-devtools-cli/src/db/connector.ts b/packages/redux-devtools-cli/src/db/connector.ts
@@ -1,9 +1,9 @@
 import path from 'path';
-import knexModule, { Config } from 'knex';
+import knexModule, { Knex } from 'knex';
 import { SCServer } from 'socketcluster-server';
 
 export default function connector(options: SCServer.SCServerOptions) {
-  const dbOptions = options.dbOptions as Config;
+  const dbOptions = options.dbOptions as Knex.Config;
   dbOptions.useNullAsDefault = true;
   if (!(dbOptions as any).migrate) {
     return knexModule(dbOptions);

diff --git a/packages/redux-devtools-cli/src/db/migrations/index.ts b/packages/redux-devtools-cli/src/db/migrations/index.ts
@@ -1,6 +1,6 @@
-import type knexModule from 'knex';
+import { Knex } from 'knex';
 
-export function up(knex: knexModule) {
+export function up(knex: Knex) {
   return Promise.all([
     knex.schema.createTable('remotedev_reports', function (table) {
       table.uuid('id').primary();
@@ -79,7 +79,7 @@ export function up(knex: knexModule) {
   ]);
 }
 
-export function down(knex: knexModule) {
+export function down(knex: Knex) {
   return Promise.all([
     knex.schema.dropTable('remotedev_reports'),
     knex.schema.dropTable('remotedev_apps'),

diff --git a/packages/redux-devtools-cli/src/db/seeds/index.ts b/packages/redux-devtools-cli/src/db/seeds/index.ts
@@ -1,6 +1,6 @@
-import type knexModule from 'knex';
+import { Knex } from 'knex';
 
-export function seed(knex: knexModule) {
+export function seed(knex: Knex) {
   return Promise.all([knex('remotedev_apps').del()]).then(function () {
     return Promise.all([
       knex('remotedev_apps').insert({

diff --git a/packages/redux-devtools-cli/src/routes.ts b/packages/redux-devtools-cli/src/routes.ts
@@ -90,7 +90,7 @@ function routes(
         break;
       case 'list':
         store
-          .list(req.body.query, req.body.fields as string[])
+          .list(req.body.query as string, req.body.fields as string[])
           .then(function (r) {
             res.send(r);
           })

diff --git a/packages/redux-devtools-cli/src/store.ts b/packages/redux-devtools-cli/src/store.ts
@@ -1,12 +1,12 @@
 import { v4 as uuidV4 } from 'uuid';
 import pick from 'lodash/pick';
 import { SCServer } from 'socketcluster-server';
-import knexModule from 'knex';
+import { Knex } from 'knex';
 import connector from './db/connector';
 
 const reports = 'remotedev_reports';
 // var payloads = 'remotedev_payloads';
-let knex: knexModule;
+let knex: Knex;
 
 const baseFields = ['id', 'title', 'added'];
 
@@ -44,13 +44,13 @@ export interface ReportBaseFields {
   added: string | null;
 }
 
-function list(query?: unknown, fields?: string[]): Promise<ReportBaseFields[]> {
+function list(query?: string, fields?: string[]): Promise<ReportBaseFields[]> {
   const r = knex.select(fields || baseFields).from(reports);
   if (query) return r.where(query);
   return r;
 }
 
-function listAll(query: unknown): Promise<Report[]> {
+function listAll(query?: string): Promise<Report[]> {
   const r = knex.select().from(reports);
   if (query) return r.where(query);
   return r;
@@ -133,8 +133,8 @@ function byBaseFields(data: Report): ReportBaseFields {
 }
 
 export interface Store {
-  list: (query?: unknown, fields?: string[]) => Promise<ReportBaseFields[]>;
-  listAll: (query?: unknown) => Promise<Report[]>;
+  list: (query?: string, fields?: string[]) => Promise<ReportBaseFields[]>;
+  listAll: (query?: string) => Promise<Report[]>;
   get: (id: string) => Promise<Report | { error: string }>;
   add: (data: AddData) => Promise<ReportBaseFields | { error: string }>;
 }