Skip to content

Commit 17ceae6

Browse files
committed
feat: upgrade to latest mongoose
1 parent b544394 commit 17ceae6

File tree

8 files changed

+500
-525
lines changed

8 files changed

+500
-525
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ jobs:
66
strategy:
77
fail-fast: false
88
matrix:
9-
node: [18, 20]
10-
mongodb-version: ['5.0', '6.0', '7.0']
9+
node: [20, 22]
10+
mongodb-version: ['6.0', '7.0', '8.0']
1111
name: Node ${{ matrix.node }} MongoDB ${{ matrix.mongodb-version }}
1212
steps:
1313
- name: Git checkout
@@ -33,10 +33,10 @@ jobs:
3333
- name: Git checkout
3434
uses: actions/checkout@v4
3535

36-
- name: Use Node.js 20
36+
- name: Use Node.js 22
3737
uses: actions/setup-node@v4
3838
with:
39-
node-version: 20
39+
node-version: 22
4040

4141
- run: npm install
4242

package-lock.json

Lines changed: 473 additions & 503 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@
3535
"mongoose": "8.x"
3636
},
3737
"devDependencies": {
38-
"@tsconfig/node20": "~20.1.2",
39-
"@types/chai": "~4.3.12",
40-
"@types/mocha": "~10.0.6",
41-
"@types/node": "~20.11.24",
42-
"@typescript-eslint/eslint-plugin": "~7.1.0",
43-
"@typescript-eslint/parser": "~7.1.0",
44-
"chai": "~4.3.10",
45-
"eslint": "~8.57.0",
46-
"mocha": "~10.3.0",
47-
"mongodb": "~6.5.0",
48-
"mongoose": "~8.3.1",
38+
"@tsconfig/node22": "~22.0.0",
39+
"@types/chai": "~4.3.16",
40+
"@types/mocha": "~10.0.10",
41+
"@types/node": "~22.10.2",
42+
"@typescript-eslint/eslint-plugin": "~7.18.0",
43+
"@typescript-eslint/parser": "~7.18.0",
44+
"chai": "~4.5.0",
45+
"eslint": "~8.57.1",
46+
"mocha": "~10.8.2",
47+
"mongodb": "~6.12.0",
48+
"mongoose": "~8.9.2",
4949
"ts-mocha": "~10.0.0",
50-
"typescript": "~5.3.3"
50+
"typescript": "~5.6.3"
5151
}
5252
}

source/types/DeletedQuery.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { HydratedDocument, QueryWithHelpers } from 'mongoose';
22
import Deleted from './Deleted';
33

4-
type DeletedQuery<T extends Deleted, TDoc = HydratedDocument<T, any, any>> = QueryWithHelpers<any, TDoc, DeletedQueryHelpers<T, TDoc>>;
4+
type DeletedQuery<T extends Deleted, TDoc = HydratedDocument<T, any, any>> = QueryWithHelpers<any, TDoc, DeletedQueryHelpers<T, TDoc>, any>;
55

66
export interface DeletedQueryHelpers<T extends Deleted, TDoc = HydratedDocument<T, any, any>> {
77
allDocuments(this: DeletedQuery<T, TDoc>): this

test/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"composite": false,
66
"outDir": "../dist/test",
77
"baseUrl": "./",
8-
"types": ["mocha"]
8+
"types": ["node", "mocha"]
99
},
1010

1111
"include": ["**/*"],

test/utils/dropModel.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import mongoose from 'mongoose';
22

33
export default async function dropModel(modelName: string): Promise<void> {
4-
await mongoose.connection.db.dropCollection(`mongoose_delete_${modelName}`);
4+
if (mongoose.connection.db) {
5+
await mongoose.connection.db.dropCollection(`mongoose_delete_${modelName}`);
6+
}
57
}

test/utils/hooks.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ export const mochaHooks = {
55
await mongoose.connect(process.env.MONGOOSE_TEST_URI || 'mongodb://127.0.0.1/test:27017');
66
},
77
async afterAll() {
8-
await mongoose.connection.db.dropDatabase();
8+
if (mongoose.connection.db) {
9+
await mongoose.connection.db.dropDatabase();
10+
}
911
await mongoose.disconnect();
1012
}
1113
};

tsconfig.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
2-
"extends": "@tsconfig/node20/tsconfig.json",
2+
"extends": "@tsconfig/node22/tsconfig.json",
33

44
"compilerOptions": {
55
"preserveConstEnums": true,
6-
"esModuleInterop": true
6+
"esModuleInterop": true,
7+
"types": ["node"]
78
},
89

910
"exclude": ["./node_modules", "./dist"]

0 commit comments

Comments
 (0)