Updated packages, adjusted configurations, fixed errors

oskardudycz · Nov 4, 2022 · 62d1bd5 · 62d1bd5
1 parent 525b948
commit 62d1bd5
Show file tree

Hide file tree

Showing 38 changed files with 3,371 additions and 6,007 deletions.
diff --git a/samples/from_crud_to_eventsourcing/package.json b/samples/from_crud_to_eventsourcing/package.json
@@ -6,10 +6,10 @@
     "build": "run-s lint build:ts",
     "build:ts": "tsc",
     "build:ts:watch": "tsc  --watch",
-    "lint": "npm run lint:eslint && npm run lint:prettier",
+    "lint": "run-s lint:eslint lint:prettier",
     "lint:prettier": "prettier --check \"**/**/!(*.d).{ts,json,md,sql}\"",
     "lint:eslint": "eslint **/*.ts",
-    "fix": "npm run fix:eslint && npm run fix:prettier",
+    "fix": "run-s fix:eslint fix:prettier",
     "fix:prettier": "prettier --write \"**/**/!(*.d).{ts,json,md,sql}\"",
     "fix:eslint": "eslint **/*.ts --fix",
     "crud:recreate": "docker-compose kill & docker-compose down -v & docker-compose up -d & npm run crud:setup & docker ps",
@@ -23,7 +23,7 @@
     "eventsourced:generate": "npx @databases/pg-schema-cli --database postgres://postgres:Password12!@localhost:5432/postgres --schemaName ecommerce --directory src/eventsourced/db/__generated__",
     "eventsourced:migrate": "pg-migrations apply --database postgres://postgres:Password12!@localhost:5432/postgres --directory ./src/eventsourced/migrations/ --ignore-error migration_file_edited",
     "eventsourced:start": "ts-node -r tsconfig-paths/register ./src/eventsourced/index.ts",
-    "test": "npm run test:unit && npm run test:int && npm run test:api && npm run test:e2e",
+    "test": "run-s test:unit test:int test:api test:e2e",
     "test:unit": "jest unit --passWithNoTests",
     "test:int": "jest int --passWithNoTests --forceExit",
     "test:api": "jest api --passWithNoTests --forceExit",

diff --git a/samples/optimisticConcurrency/.eslintignore b/samples/optimisticConcurrency/.eslintignore
@@ -6,4 +6,6 @@ dist/*coverage/*
 **/*.d.ts
 
 # custom definition files
-/src/types/
+/src/types/
+
+!.eslintrc.js
diff --git a/samples/optimisticConcurrency/.eslintrc.json b/samples/optimisticConcurrency/.eslintrc.json
@@ -1,16 +1,29 @@
 {
   "env": {
-    "es2020": true,
+    "es2022": true,
     "node": true
   },
-  "extends": ["plugin:prettier/recommended"],
+  "plugins": ["@typescript-eslint"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:@typescript-eslint/recommended-requiring-type-checking",
+    "plugin:prettier/recommended"
+  ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
-    "ecmaVersion": 11,
-    "sourceType": "module"
+    "ecmaVersion": 13,
+    "sourceType": "module",
+    "project": "./tsconfig.json"
+  },
+  "rules": {
+    "no-unused-vars": "off",
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_" }
+    ],
+    "@typescript-eslint/no-misused-promises": ["off"]
   },
-  "plugins": ["@typescript-eslint"],
-  "rules": {},
   "settings": {
     "import/resolver": {
       "typescript": {}

diff --git a/samples/optimisticConcurrency/.prettierignore b/samples/optimisticConcurrency/.prettierignore
@@ -0,0 +1,2 @@
+**/dist/
+**/lib/
diff --git a/samples/optimisticConcurrency/.vscode/settings.json b/samples/optimisticConcurrency/.vscode/settings.json
@@ -1,4 +1,5 @@
 {
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnPaste": false,
   "editor.formatOnSave": true,
 

diff --git a/samples/optimisticConcurrency/docker-compose.esdb.yml b/samples/optimisticConcurrency/docker-compose.esdb.yml
@@ -2,7 +2,7 @@ version: '3.4'
 
 services:
   eventstore.db:
-    image: eventstore/eventstore:21.2.0-buster-slim
+    image: eventstore/eventstore:21.10.8-buster-slim
     environment:
       - EVENTSTORE_CLUSTER_SIZE=1
       - EVENTSTORE_RUN_PROJECTIONS=All