fix: fixing commit conflicts in animal.spec.ts.map

faker-js · Jul 29, 2022 · 43bb61f · 43bb61f
2 parents d5c1398 + de39d9c
commit 43bb61f
Show file tree

Hide file tree

Showing 75 changed files with 3,624 additions and 2,416 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -50,7 +50,16 @@ module.exports = defineConfig({
         allowBoolean: true,
       },
     ],
-    '@typescript-eslint/unbound-method': 'warn',
+    '@typescript-eslint/unbound-method': 'off',
+    '@typescript-eslint/naming-convention': [
+      'error',
+      {
+        format: ['PascalCase'],
+        selector: ['class', 'interface', 'typeAlias', 'enumMember'],
+        leadingUnderscore: 'forbid',
+        trailingUnderscore: 'forbid',
+      },
+    ],
   },
   overrides: [
     {
@@ -63,9 +72,7 @@ module.exports = defineConfig({
         'jsdoc/require-returns-type': 'off',
         'jsdoc/require-returns': 'off',
         'jsdoc/tag-lines': 'off',
-
-        // We want to explicitly set this rule to error in the future
-        'jsdoc/sort-tags': 'warn',
+        'jsdoc/sort-tags': 'error',
       },
       settings: {
         jsdoc: {

diff --git a/cypress.config.ts b/cypress.config.ts
@@ -4,7 +4,7 @@ export default defineConfig({
   video: false,
   e2e: {
     chromeWebSecurity: false,
-    baseUrl: 'http://localhost:5000',
+    baseUrl: 'http://localhost:5173',
     supportFile: false,
     fixturesFolder: false,
   },

diff --git a/package.json b/package.json
@@ -66,7 +66,7 @@
     "docs:prepare": "run-s generate:api-docs",
     "docs:dev": "run-s docs:prepare docs:dev:run",
     "docs:dev:run": "vitepress dev docs",
-    "docs:serve": "vitepress serve docs",
+    "docs:serve": "vitepress serve docs --port 5173",
     "format": "prettier --write .",
     "lint": "eslint --cache --cache-strategy content .",
     "ts-check:scripts": "tsc --project tsconfig.check-scripts.json",
@@ -93,21 +93,21 @@
     ]
   },
   "devDependencies": {
-    "@algolia/client-search": "~4.13.1",
+    "@algolia/client-search": "~4.14.1",
     "@types/markdown-it": "~12.2.3",
-    "@types/node": "~18.0.0",
-    "@types/prettier": "~2.6.3",
-    "@types/react": "~18.0.14",
+    "@types/node": "~18.0.6",
+    "@types/prettier": "~2.6.4",
+    "@types/react": "~18.0.15",
     "@types/sanitize-html": "~2.6.2",
     "@types/validator": "~13.7.4",
-    "@typescript-eslint/eslint-plugin": "~5.30.5",
-    "@typescript-eslint/parser": "~5.30.5",
-    "@vitest/ui": "~0.17.1",
-    "c8": "~7.11.3",
+    "@typescript-eslint/eslint-plugin": "~5.31.0",
+    "@typescript-eslint/parser": "~5.31.0",
+    "@vitest/ui": "~0.19.1",
+    "c8": "~7.12.0",
     "conventional-changelog-cli": "~2.2.2",
-    "cypress": "~10.3.0",
-    "esbuild": "~0.14.48",
-    "eslint": "~8.19.0",
+    "cypress": "~10.3.1",
+    "esbuild": "~0.14.50",
+    "eslint": "~8.20.0",
     "eslint-config-prettier": "~8.5.0",
     "eslint-define-config": "~1.5.1",
     "eslint-gitignore": "~0.1.0",
@@ -123,19 +123,19 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "rimraf": "~3.0.2",
-    "sanitize-html": "~2.7.0",
+    "sanitize-html": "~2.7.1",
     "simple-git-hooks": "~2.8.0",
     "standard-version": "~9.5.0",
-    "tsx": "~3.7.1",
-    "typedoc": "~0.23.2",
+    "tsx": "~3.8.0",
+    "typedoc": "~0.23.9",
     "typedoc-plugin-missing-exports": "~0.23.0",
     "typescript": "~4.7.4",
     "validator": "~13.7.0",
-    "vite": "~2.9.13",
+    "vite": "~3.0.3",
     "vitepress": "~0.22.4",
-    "vitest": "~0.17.1"
+    "vitest": "~0.19.1"
   },
-  "packageManager": "pnpm@7.5.0",
+  "packageManager": "pnpm@7.6.0",
   "engines": {
     "node": ">=14.0.0",
     "npm": ">=6.0.0"