From 497c6ecf5b778af847f983323aa544be472465ad Mon Sep 17 00:00:00 2001 From: Thyen Chang Date: Sun, 17 Sep 2023 12:04:41 -0300 Subject: [PATCH 1/5] feat: upgrade knex to ^2 --- lib/unexpected-knex.js | 6 +++--- package.json | 2 +- test/unexpected-knex.spec.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/unexpected-knex.js b/lib/unexpected-knex.js index 063fe8e..edb7fb0 100644 --- a/lib/unexpected-knex.js +++ b/lib/unexpected-knex.js @@ -1,8 +1,8 @@ const util = require('util'); const Knex = require('knex'); const proxyquire = require('proxyquire'); -const QueryBuilder = require('knex/lib/query/builder'); -const knexMigrationListResolver = require('knex/lib/migrate/migration-list-resolver'); +const QueryBuilder = require('knex/lib/query/querybuilder'); +const knexMigrationListResolver = require('knex/lib/migrations/migrate/migration-list-resolver'); let unexpectedKnexMigratorFilename; const getUnexpectedKnexMigratorFilenames = function (sources) { @@ -25,7 +25,7 @@ const unexpectedKnexMigrationListResolver = Object.assign( }, ); -const UnexpectedKnexMigrator = proxyquire('knex/lib/migrate/Migrator', { +const UnexpectedKnexMigrator = proxyquire('knex/lib/migrations/migrate/Migrator', { './migration-list-resolver': unexpectedKnexMigrationListResolver, }).Migrator; diff --git a/package.json b/package.json index aaacab9..55de585 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "eslint-plugin-n": "^16.1.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^6.1.1", - "knex": "^0.21.0", + "knex": "^2.5.1", "mocha": "^10.2.0", "mock-fs": "^5.2.0", "nyc": "^15.1.0", diff --git a/test/unexpected-knex.spec.js b/test/unexpected-knex.spec.js index 534eb40..00214b0 100644 --- a/test/unexpected-knex.spec.js +++ b/test/unexpected-knex.spec.js @@ -10,7 +10,7 @@ const assertErrorOuput = process.env.ASSERT_ERROR_OUTPUT !== 'false'; // This file is `require`d lazily by Knex's migrator, so we have to require it // here so that it's cached by Node.js before we go on to mock out `require`. -require('knex/lib/util/import-file.js'); +require('knex/lib/migrations/util/import-file.js'); // Knex `require`s migrations lazily and in the process tries to figure out if // it should use `import` or `require`. The following hacks make it bypass those // checks and default to using `require`. From b9961816d0c1bc73c6a53e1016b79ca54143b2c8 Mon Sep 17 00:00:00 2001 From: Thyen Chang Date: Sun, 17 Sep 2023 12:04:58 -0300 Subject: [PATCH 2/5] chore: specify version range for knex peerDependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 55de585..755abaf 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "author": "Joel Mukuthu ", "license": "MIT", "peerDependencies": { - "knex": "^0.16.0", + "knex": "^0.95.0 || ^1 || ^2", "unexpected": "^10.27.0 || ^11.0.0 || ^12.0.0" }, "devDependencies": { From daa0e78c6424011fbea29252a0f4a8bca68486f7 Mon Sep 17 00:00:00 2001 From: Thyen Chang Date: Mon, 18 Sep 2023 07:45:57 -0300 Subject: [PATCH 3/5] chore: upgrade node version on Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2476c3b..eb63b8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM node:12-alpine +FROM node:18-alpine WORKDIR /usr/src/app From 113a2d83388ab86e4522b7dda785fa7405ebfdbf Mon Sep 17 00:00:00 2001 From: Thyen Chang Date: Mon, 18 Sep 2023 07:46:21 -0300 Subject: [PATCH 4/5] fix: update path to require QueryBuilder --- test/unexpected-knex.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unexpected-knex.spec.js b/test/unexpected-knex.spec.js index 00214b0..5525ecb 100644 --- a/test/unexpected-knex.spec.js +++ b/test/unexpected-knex.spec.js @@ -1,6 +1,6 @@ const path = require('path'); const Knex = require('knex'); -const QueryBuilder = require('knex/lib/query/builder'); +const QueryBuilder = require('knex/lib/query/querybuilder'); const unexpected = require('unexpected'); const mockFs = require('mock-fs'); const unexpectedRequire = require('unexpected-require'); From 1834d79ba790ac9c40f541f0496b2e5977cc9414 Mon Sep 17 00:00:00 2001 From: Thyen Chang Date: Mon, 18 Sep 2023 07:46:29 -0300 Subject: [PATCH 5/5] chore: lint fix --- lib/unexpected-knex.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/unexpected-knex.js b/lib/unexpected-knex.js index edb7fb0..f068910 100644 --- a/lib/unexpected-knex.js +++ b/lib/unexpected-knex.js @@ -25,9 +25,12 @@ const unexpectedKnexMigrationListResolver = Object.assign( }, ); -const UnexpectedKnexMigrator = proxyquire('knex/lib/migrations/migrate/Migrator', { - './migration-list-resolver': unexpectedKnexMigrationListResolver, -}).Migrator; +const UnexpectedKnexMigrator = proxyquire( + 'knex/lib/migrations/migrate/Migrator', + { + './migration-list-resolver': unexpectedKnexMigrationListResolver, + }, +).Migrator; function MigrationTest(knex, expect) { this.knex = knex;