Merge pull request #25 from JakeGinnivan/fix/UpgradeKnexDependency

fix: Upgrade to version of knex without security warnings
sevenwestmedia-labs · Oct 23, 2019 · 397c763 · 397c763
2 parents 0faaea5 + fd3c6a8
commit 397c763
Show file tree

Hide file tree

Showing 4 changed files with 166 additions and 102 deletions.
diff --git a/@types/mock-knex/index.d.ts b/@types/mock-knex/index.d.ts
@@ -0,0 +1,16 @@
+declare module 'mock-knex' {
+    import Knex from 'knex'
+
+    export interface QueryDetails {
+        response(value: any): void
+    }
+
+    export function getTracker(): {
+        on: (
+            event: 'query',
+            handler: (query: QueryDetails, step: number) => void,
+        ) => void
+    }
+
+    export function mock(knex: Knex): void
+}
diff --git a/package.json b/package.json
@@ -17,24 +17,23 @@
     "author": "Jake Ginnivan",
     "license": "MIT",
     "devDependencies": {
-        "@types/cross-spawn": "^6.0.0",
-        "@types/jest": "^24.0.18",
-        "@types/node": "^12.7.2",
-        "@types/mock-knex": "^0.4.1",
-        "@typescript-eslint/eslint-plugin": "^2.0.0",
-        "@typescript-eslint/parser": "^2.0.0",
-        "cross-spawn": "^7.0.0",
-        "eslint": "^6.2.2",
-        "eslint-config-prettier": "^6.1.0",
-        "eslint-config-wanews-base": "^2.0.1",
+        "@types/cross-spawn": "^6.0.1",
+        "@types/jest": "^24.0.19",
+        "@types/node": "^12.11.5",
+        "@typescript-eslint/eslint-plugin": "^2.5.0",
+        "@typescript-eslint/parser": "^2.5.0",
+        "cross-spawn": "^7.0.1",
+        "eslint": "^6.5.1",
+        "eslint-config-prettier": "^6.4.0",
+        "eslint-config-wanews-base": "^2.0.2",
         "jest": "^24.9.0",
-        "knex": "^0.19.3",
+        "knex": "^0.19.5",
         "mock-knex": "^0.4.6",
-        "ts-jest": "^24.0.2",
-        "typescript": "^3.6.2"
+        "ts-jest": "^24.1.0",
+        "typescript": "^3.6.4"
     },
     "peerDependencies": {
-        "knex": "^0.16.0",
+        "knex": "^0.19.0",
         "tslib": "^1.10.0"
     }
-}
+}
diff --git a/src/type-safety-fixtures/testconfig.json b/src/type-safety-fixtures/testconfig.json
@@ -1,12 +1,13 @@
 {
     "compilerOptions": {
         "noEmit": true,
-        "rootDir": "../",
+        "rootDir": "../../",
         "strict": true,
         "module": "commonjs",
         "moduleResolution": "node",
         "skipLibCheck": true,
         "esModuleInterop": true,
-        "lib": ["es2015"]
+        "lib": ["es2015"],
+        "typeRoots": ["../../@types"]
     }
 }