Merge branch 'master' into feat/mongodb-5

Signed-off-by: Diana Lau <[email protected]>

Author: dhmlau

.github/workflows/continuous-integration.yaml

@@ -4,11 +4,11 @@ on:
   push:
     branches:
     - master
-    - 5.x
+    - 6.x
   pull_request:
     branches:
     - master
-    - 5.x
+    - 6.x
   schedule:
     - cron: '0 2 * * 1' # At 02:00 on Monday
 
@@ -21,17 +21,16 @@ jobs:
     timeout-minutes: 15
     strategy:
       matrix:
-        node-version: [18, 19, 20, 21]
+        node-version: [20, 22, 24]
         mongodb-version:
-          - '4.4'
           - '5.0'
           - '6.0'
           - '7.0'
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - name: Start MongoDB
@@ -71,9 +70,9 @@ jobs:
     name: Code Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js 16
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 16
       - name: Bootstrap project
@@ -85,11 +84,11 @@ jobs:
     name: Commit Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Use Node.js 16
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 16
       - name: Bootstrap project
@@ -105,13 +104,13 @@ jobs:
       security-events: write
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: 'javascript'
         config-file: ./.github/codeql/codeql-config.yml
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.npmignore

@@ -0,0 +1,6 @@
+node_modules
+coverage
+.idea
+.nyc_output/
+test
+.travis.yml

.travis.yml

@@ -22,9 +22,9 @@ This module adopts the [Module Long Term Support (LTS)](http://github.com/CloudN
 
 | Version    | Status               | Published | EOL                  | LoopBack | Juggler  |
 | ---------- | -------------------- | --------- | -------------------- | ---------|----------|
-| 6.x        | Current              | Mar 2021  | Apr 2025 _(minimum)_ | 4        | 4.x      |
-| 5.x        | Active LTS           | Jun 2019  | Apr 2023             | 3, 4     | 3.x, 4.x |
-| 4.x        | Maintenance LTS      | Nov 2018  | Apr 2021             | 3, 4     | 3.x, 4.x |
+| 6.x        | Current              | Mar 2021  | Apr 2028 _(minimum)_ | 4        | 4.x      |
+| 5.x        | End-of-Life          | Jun 2019  | Apr 2023             | 3, 4     | 3.x, 4.x |
+| 4.x        | End-of-Life          | Nov 2018  | Apr 2021             | 3, 4     | 3.x, 4.x |
 
 ## Creating a MongoDB data source
 

README.md

@@ -197,8 +197,8 @@ function MongoDB(settings, dataSource) {
     this.settings.enableOptimizedfindOrCreate === true ||
     this.settings.enableOptimizedFindOrCreate === true
   ) {
-    debug('Optimized findOrCreate is enabled by default, and the enableOptimizedFindOrCreate setting ' +
-      'is ignored since v7.0.0.');
+    debug('Optimized findOrCreate is enabled by default, ' +
+      'and the enableOptimizedFindOrCreate setting is ignored since v7.0.0.');
   }
 
   if (this.settings.enableGeoIndexing === true) {