Merge branch 'main' into subdocument-fix

ilovepixelart · Mar 13, 2024 · 6341e93 · 6341e93
2 parents 6dae0a6 + f5d2803
commit 6341e93
Show file tree

Hide file tree

Showing 24 changed files with 813 additions and 440 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -13,8 +13,9 @@
   ],
   "extends": [
     "eslint:recommended",
+    "plugin:sonarjs/recommended",
     "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:sonarjs/recommended"
+    "plugin:@stylistic/recommended-extends"
   ],
   "globals": {
     "Atomics": "readonly",
@@ -25,33 +26,13 @@
     "sourceType": "module"
   },
   "rules": {
-    "comma-dangle": [
-      "error",
-      "never"
-    ],
+
+    "@stylistic/arrow-parens": ["error", "always"],
+    "@stylistic/brace-style": ["error", "1tbs"],
     "@typescript-eslint/array-type": "error",
     "@typescript-eslint/consistent-type-imports": "error",
     "@typescript-eslint/method-signature-style": "error",
-    "@typescript-eslint/consistent-indexed-object-style": "error",
-    "indent": [
-      "error",
-      2
-    ],
-    "arrow-parens": [
-      "error"
-    ],
-    "linebreak-style": [
-      "error",
-      "unix"
-    ],
-    "quotes": [
-      "error",
-      "single"
-    ],
-    "semi": [
-      "error",
-      "never"
-    ]
+    "@typescript-eslint/consistent-indexed-object-style": "error"
   },
   "overrides": [
     {

diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml
@@ -70,6 +70,7 @@ jobs:
         run: npm run test
 
       - name: Scan
+        if: env.SONAR_TOKEN
         uses: sonarsource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+<a name="v2.5.5"></a>
+# [v2.5.5](https://github.com/ilovepixelart/ts-patch-mongoose/releases/tag/v2.5.5) - 24 Feb 2024
+
+- Dep  ff2af22
+- Merge pull request [#186](https://github.com/ilovepixelart/ts-patch-mongoose/issues/186) from ilovepixelart/feature/dep  497ebc9
+- Dep  0f4032f
+- Update changelog for v2.5.4  588b7ef
+- Merge pull request [#181](https://github.com/ilovepixelart/ts-patch-mongoose/issues/181) from ilovepixelart/feature/dep  bd556d2
+- Dep  b467576
+- Merge pull request [#172](https://github.com/ilovepixelart/ts-patch-mongoose/issues/172) from ilovepixelart/feature/dep  e23513b
+- Dep  acd9baf
+- Update changelog for &quot;v2.5.4&quot;  f9c3f56
+
+https://github.com/ilovepixelart/ts-patch-mongoose/compare/v2.5.4...v2.5.5
+
+[Changes][v2.5.5]
+
+
 <a name="v2.5.4"></a>
 # [v2.5.4](https://github.com/ilovepixelart/ts-patch-mongoose/releases/tag/v2.5.4) - 20 Jan 2024
 
@@ -692,6 +710,7 @@ First release
 [Changes][v1.0.2]
 
 
+[v2.5.5]: https://github.com/ilovepixelart/ts-patch-mongoose/compare/v2.5.4...v2.5.5
 [v2.5.4]: https://github.com/ilovepixelart/ts-patch-mongoose/compare/v2.5.3...v2.5.4
 [v2.5.3]: https://github.com/ilovepixelart/ts-patch-mongoose/compare/v2.5.2...v2.5.3
 [v2.5.2]: https://github.com/ilovepixelart/ts-patch-mongoose/compare/v2.5.1...v2.5.2
@@ -736,4 +755,4 @@ First release
 [v1.0.3]: https://github.com/ilovepixelart/ts-patch-mongoose/compare/v1.0.2...v1.0.3
 [v1.0.2]: https://github.com/ilovepixelart/ts-patch-mongoose/tree/v1.0.2
 
-<!-- Generated by https://github.com/rhysd/changelog-from-release v3.7.1 -->
+<!-- Generated by https://github.com/rhysd/changelog-from-release v3.7.2 -->
diff --git a/jest-mongodb-config.ts b/jest-mongodb-config.ts
@@ -1,10 +1,10 @@
 export default {
   mongodbMemoryServerOptions: {
     binary: {
-      skipMD5: true
+      skipMD5: true,
     },
     autoStart: false,
-    instance: {}
+    instance: {},
   },
-  useSharedDBForAllJestWorkers: false
+  useSharedDBForAllJestWorkers: false,
 }
diff --git a/jest.config.ts b/jest.config.ts
@@ -5,28 +5,28 @@ const mongo = require('@shelf/jest-mongodb/jest-preset')
 const config = recursive(mongo, {
   roots: [
     '<rootDir>/src/',
-    '<rootDir>/tests/'
+    '<rootDir>/tests/',
   ],
   clearMocks: true,
   collectCoverage: true,
   collectCoverageFrom: [
     'src/**/*.ts',
     '!src/**/*.d.ts',
-    '!src/interfaces/**/*.ts'
+    '!src/interfaces/**/*.ts',
   ],
   coverageDirectory: 'coverage',
   testMatch: [
-    '<rootDir>/tests/**/*.test.ts'
+    '<rootDir>/tests/**/*.test.ts',
   ],
   transform: {
-    '^.+\\.(t|j)sx?$': '@swc/jest'
+    '^.+\\.(t|j)sx?$': '@swc/jest',
   },
   testPathIgnorePatterns: [
-    'node_modules'
+    'node_modules',
   ],
   watchPathIgnorePatterns: [
-    'globalConfig'
-  ]
+    'globalConfig',
+  ],
 })
 
 module.exports = config