Skip to content

Commit b3d8b10

Browse files
vkarpov15vkarpov15
committed
Merge branch 'master' into 9.0
2 parents eb422c1 + 537032d commit b3d8b10

File tree

169 files changed

+6241
-1502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+6241
-1502
lines changed

‎.eslintrc.js

+6-20
Original file line numberDiff line numberDiff line change
@@ -56,29 +56,15 @@ module.exports = {
5656
'@typescript-eslint/ban-types': 'off',
5757
'@typescript-eslint/no-unused-vars': 'off',
5858
'@typescript-eslint/explicit-module-boundary-types': 'off',
59-
'@typescript-eslint/indent': [
60-
'warn',
61-
2,
62-
{
63-
SwitchCase: 1,
64-
ignoredNodes: ['TSTypeParameterInstantiation']
65-
}
66-
],
6759
'@typescript-eslint/prefer-optional-chain': 'error',
68-
'@typescript-eslint/brace-style': 'error',
6960
'@typescript-eslint/no-dupe-class-members': 'error',
7061
'@typescript-eslint/no-redeclare': 'error',
71-
'@typescript-eslint/type-annotation-spacing': 'error',
72-
'@typescript-eslint/object-curly-spacing': [
73-
'error',
74-
'always'
75-
],
76-
'@typescript-eslint/semi': 'error',
77-
'@typescript-eslint/space-before-function-paren': [
78-
'error',
79-
'never'
80-
],
81-
'@typescript-eslint/space-infix-ops': 'off'
62+
'@typescript-eslint/space-infix-ops': 'off',
63+
'@typescript-eslint/no-require-imports': 'off',
64+
'@typescript-eslint/no-empty-object-type': 'off',
65+
'@typescript-eslint/no-wrapper-object-types': 'off',
66+
'@typescript-eslint/no-unused-expressions': 'off',
67+
'@typescript-eslint/no-unsafe-function-type': 'off'
8268
}
8369
},
8470
{

‎.github/workflows/benchmark.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
runs-on: ubuntu-20.04
2323
name: Benchmark TypeScript Types
2424
steps:
25-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
25+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626
with:
2727
fetch-depth: 0
2828
- name: Setup node
29-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
29+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
3030
with:
3131
node-version: 16
3232

‎.github/workflows/codeql.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
24+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2525

2626
# Initializes the CodeQL tools for scanning.
2727
- name: Initialize CodeQL

‎.github/workflows/documentation.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ jobs:
2828
runs-on: ubuntu-latest
2929
name: Lint Markdown files
3030
steps:
31-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
31+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3232

3333
- name: Setup node
34-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
34+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
3535
with:
36-
node-version: 16
36+
node-version: 20
3737

3838
- run: npm install
3939

@@ -48,13 +48,13 @@ jobs:
4848
runs-on: ubuntu-20.04
4949
name: Test Generating Docs
5050
steps:
51-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
51+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5252
- run: git fetch --depth=1 --tags # download all tags for documentation
5353

5454
- name: Setup node
55-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
55+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
5656
with:
57-
node-version: 16
57+
node-version: 20
5858

5959
- run: npm install
6060
- name: Setup MongoDB

‎.github/workflows/test.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
runs-on: ubuntu-latest
2323
name: Lint JS-Files
2424
steps:
25-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
25+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626

2727
- name: Setup node
28-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
28+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
2929
with:
3030
node-version: 18
3131

@@ -41,27 +41,27 @@ jobs:
4141
matrix:
4242
node: [16, 18, 20]
4343
os: [ubuntu-20.04, ubuntu-22.04]
44-
mongodb: [4.4.28, 5.0.25, 6.0.14, 7.0.7]
44+
mongodb: [4.4.29, 5.0.26, 6.0.15, 7.0.12, 8.0.0]
4545
include:
4646
- os: ubuntu-20.04 # customize on which matrix the coverage will be collected on
47-
mongodb: 5.0.25
47+
mongodb: 5.0.26
4848
node: 16
4949
coverage: true
5050
exclude:
5151
- os: ubuntu-22.04 # exclude because there are no 4.x mongodb builds for 2204
52-
mongodb: 4.4.28
52+
mongodb: 4.4.29
5353
- os: ubuntu-22.04 # exclude because there are no 5.x mongodb builds for 2204
54-
mongodb: 5.0.25
54+
mongodb: 5.0.26
5555
name: Node ${{ matrix.node }} MongoDB ${{ matrix.mongodb }} OS ${{ matrix.os }}
5656
env:
5757
MONGOMS_VERSION: ${{ matrix.mongodb }}
5858
MONGOMS_PREFER_GLOBAL_PATH: 1
5959
FORCE_COLOR: true
6060
steps:
61-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
61+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6262

6363
- name: Setup node
64-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
64+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
6565
with:
6666
node-version: ${{ matrix.node }}
6767

@@ -90,13 +90,13 @@ jobs:
9090
runs-on: ubuntu-20.04
9191
name: Deno tests
9292
env:
93-
MONGOMS_VERSION: 6.0.14
93+
MONGOMS_VERSION: 6.0.15
9494
MONGOMS_PREFER_GLOBAL_PATH: 1
9595
FORCE_COLOR: true
9696
steps:
97-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
97+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9898
- name: Setup node
99-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
99+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
100100
with:
101101
node-version: 16
102102
- name: Load MongoDB binary cache
@@ -106,7 +106,7 @@ jobs:
106106
path: ~/.cache/mongodb-binaries
107107
key: deno-${{ env.MONGOMS_VERSION }}
108108
- name: Setup Deno
109-
uses: denoland/setup-deno@v1
109+
uses: denoland/setup-deno@v2
110110
with:
111111
deno-version: v1.37.x
112112
- run: deno --version
@@ -122,9 +122,9 @@ jobs:
122122
env:
123123
FORCE_COLOR: true
124124
steps:
125-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
125+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
126126
- name: Setup node
127-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
127+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
128128
with:
129129
node-version: 16
130130
- run: npm install
@@ -139,6 +139,6 @@ jobs:
139139
contents: read
140140
steps:
141141
- name: Check out repo
142-
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
142+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
143143
- name: Dependency review
144144
uses: actions/dependency-review-action@v4

‎.github/workflows/tidelift-alignment.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
if: github.repository == 'Automattic/mongoose'
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
18+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1919
- name: Setup node
20-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
20+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
2121
with:
2222
node-version: 16
2323
- name: Alignment

‎.github/workflows/tsd.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
runs-on: ubuntu-latest
2121
name: Lint TS-Files
2222
steps:
23-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
23+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2424

2525
- name: Setup node
26-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
26+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
2727
with:
2828
node-version: 18
2929

@@ -38,12 +38,12 @@ jobs:
3838
runs-on: ubuntu-latest
3939
name: Test Typescript Types
4040
steps:
41-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
41+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4242

4343
- name: Setup node
44-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
44+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
4545
with:
46-
node-version: 14
46+
node-version: 16
4747

4848
- run: npm install
4949

‎.npmignore

+2
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,5 @@ tsconfig.json
5757
# scripts
5858
scripts/
5959
tools/
60+
61+
*.0x

0 commit comments

Comments
 (0)