chore(): resolved conflicts

Author: Tony133

.gitignore

@@ -70,3 +70,4 @@ Thumbs.db
 *.sublime-project
 *.sublime-workspace
 yarn.lock
+tags

apps/http-sample/jest.config.js

@@ -2,4 +2,7 @@ const baseConfig = require('../../jest.config');
 
 module.exports = {
   ...baseConfig,
+  moduleNameMapper: {
+    '^axios$': require.resolve('axios'),
+  },
 };

apps/http-sample/test/jest-e2e.js

@@ -2,4 +2,7 @@ const e2eBaseConfig = require('../../../jest.e2e');
 
 module.exports = {
   ...e2eBaseConfig,
+  moduleNameMapper: {
+    '^axios$': require.resolve('axios'),
+  },
 };

jest.e2e.js

@@ -7,4 +7,5 @@ module.exports = {
   ...baseConfig,
   rootDir: '..',
   testMatch: ['<rootDir>/test/**/*.e2e-spec.ts'],
+  transformIgnorePatterns: ['node_modules/(?!axios)'],
 };

migrations.json

@@ -0,0 +1,28 @@
+{
+  "migrations": [
+    {
+      "cli": "nx",
+      "version": "15.0.0-beta.1",
+      "description": "Replace implicitDependencies with namedInputs + target inputs",
+      "implementation": "./src/migrations/update-15-0-0/migrate-to-inputs",
+      "package": "nx",
+      "name": "15.0.0-migrate-to-inputs"
+    },
+    {
+      "cli": "nx",
+      "version": "15.0.0-beta.1",
+      "description": "Prefix outputs with {workspaceRoot}/{projectRoot} if needed",
+      "implementation": "./src/migrations/update-15-0-0/prefix-outputs",
+      "package": "nx",
+      "name": "15.0.0-prefix-outputs"
+    },
+    {
+      "version": "15.0.0-beta.0",
+      "cli": "nx",
+      "description": "Stop hashing jest spec files and config files for build targets and dependent tasks",
+      "factory": "./src/migrations/update-15-0-0/add-jest-inputs",
+      "package": "@nrwl/jest",
+      "name": "add-jest-inputs"
+    }
+  ]
+}

nx.json

@@ -6,13 +6,6 @@
   "cli": {
     "defaultCollection": "@nrwl/nest"
   },
-  "implicitDependencies": {
-    "package.json": {
-      "dependencies": "*",
-      "devDependencies": "*"
-    },
-    ".eslintrc.json": "*"
-  },
   "tasksRunnerOptions": {
     "default": {
       "runner": "@nrwl/workspace/tasks-runners/default",
@@ -29,5 +22,26 @@
       }
     ]
   },
-  "defaultProject": "testing-nestjs"
+  "defaultProject": "testing-nestjs",
+  "namedInputs": {
+    "default": ["{projectRoot}/**/*", "sharedGlobals"],
+    "sharedGlobals": [],
+    "production": [
+      "default",
+      "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
+      "!{projectRoot}/tsconfig.spec.json",
+      "!{projectRoot}/jest.config.[jt]s"
+    ]
+  },
+  "targetDefaults": {
+    "build": {
+      "inputs": ["production", "^production"]
+    },
+    "test": {
+      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
+    },
+    "e2e": {
+      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
+    }
+  }
 }

package.json

@@ -45,61 +45,61 @@
   "dependencies": {
     "@nestjs/apollo": "10.1.3",
     "@nestjs/axios": "0.1.0",
-    "@nestjs/common": "^9.1.2",
+    "@nestjs/common": "^9.1.4",
     "@nestjs/config": "^2.2.0",
-    "@nestjs/core": "^9.1.2",
+    "@nestjs/core": "^9.1.4",
     "@nestjs/cqrs": "^9.0.1",
     "@nestjs/graphql": "^10.1.3",
     "@nestjs/mapped-types": "^1.2.0",
-    "@nestjs/microservices": "^9.1.2",
+    "@nestjs/microservices": "^9.1.4",
     "@nestjs/mongoose": "^9.0.1",
-    "@nestjs/platform-express": "^9.1.2",
-    "@nestjs/platform-fastify": "^9.1.2",
-    "@nestjs/platform-socket.io": "^9.1.2",
-    "@nestjs/platform-ws": "^9.1.2",
+    "@nestjs/platform-express": "^9.1.4",
+    "@nestjs/platform-fastify": "^9.1.4",
+    "@nestjs/platform-socket.io": "^9.1.4",
+    "@nestjs/platform-ws": "^9.1.4",
     "@nestjs/sequelize": "^9.0.0",
     "@nestjs/serve-static": "^3.0.0",
     "@nestjs/typeorm": "^9.0.1",
     "@nestjs/websockets": "^9.1.2",
     "@prisma/client": "^3.1.1",
     "apollo-server-core": "^3.10.2",
     "apollo-server-express": "^3.10.2",
-    "axios": "^0.24.0",
+    "axios": "1.2.0-alpha.1",
     "class-transformer": "^0.5.1",
-    "class-validator": "^0.13.1",
-    "graphql": "^15.5.0",
-    "graphql-tools": "^7.0.4",
-    "hbs": "^4.1.1",
-    "mongoose": "^6.0.13",
-    "mysql2": "^2.2.5",
-    "pg": "^8.5.1",
+    "class-validator": "^0.13.2",
+    "graphql": "15.5.0",
+    "graphql-tools": "7.0.4",
+    "hbs": "^4.2.0",
+    "mongoose": "^6.6.5",
+    "mysql2": "^2.3.3",
+    "pg": "^8.8.0",
     "redis": "^3.0.2",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
-    "rxjs": "^7.4.0",
+    "rxjs": "^7.5.7",
     "sequelize": "^6.11.0",
     "sequelize-typescript": "^2.1.3",
     "socket.io-client": "^4.4.0",
     "typeorm": "^0.3.10"
   },
   "devDependencies": {
-    "@commitlint/cli": "^12.0.1",
-    "@commitlint/config-conventional": "^12.0.1",
+    "@commitlint/cli": "^17.1.2",
+    "@commitlint/config-conventional": "^17.1.0",
     "@golevelup/nestjs-testing": "^0.1.2",
-    "@golevelup/ts-jest": "^0.3.2",
+    "@golevelup/ts-jest": "^0.3.3",
     "@nestjs/cli": "^9.1.4",
     "@nestjs/schematics": "^9.0.3",
     "@nestjs/testing": "^9.1.2",
-    "@nrwl/cli": "14.8.3",
-    "@nrwl/jest": "^14.8.3",
-    "@nrwl/nest": "^14.8.3",
-    "@nrwl/node": "^14.8.3",
-    "@nrwl/tao": "^14.8.3",
-    "@nrwl/workspace": "^14.8.3",
+    "@nrwl/cli": "15.0.4",
+    "@nrwl/jest": "15.0.4",
+    "@nrwl/nest": "15.0.4",
+    "@nrwl/node": "15.0.4",
+    "@nrwl/tao": "15.0.4",
+    "@nrwl/workspace": "15.0.4",
     "@types/express": "^4.17.1",
-    "@types/jest": "^29.1.2",
+    "@types/jest": "^27.5.2",
     "@types/multer": "^1.4.7",
-    "@types/node": "^17.0.5",
+    "@types/node": "18.11.0",
     "@types/sequelize": "^4.28.9",
     "@types/serve-static": "^1.13.9",
     "@types/supertest": "^2.0.11",
@@ -112,19 +112,20 @@
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "husky": "8.0.1",
-    "jest": "^29.0.1",
+    "jest": "^27.5.1",
     "lint-staged": "^10.5.4",
-    "nx": "^14.8.3",
+    "multer": "1.4.5-lts.1",
+    "nx": "15.0.4",
     "pactum": "^3.2.2",
     "prettier": "^2.2.1",
     "prisma": "^3.1.1",
     "supertest": "^6.1.3",
-    "ts-jest": "^29.0.3",
-    "ts-loader": "^9.2.6",
-    "ts-node": "^10.7.0",
-    "tsconfig-paths": "^3.9.0",
-    "typescript": "^4.7.4",
-    "uuid": "^8.3.2"
+    "ts-jest": "^27.1.5",
+    "ts-loader": "^9.4.1",
+    "ts-node": "^10.9.1",
+    "tsconfig-paths": "^4.1.0",
+    "typescript": "^4.8.4",
+    "uuid": "^9.0.0"
   },
   "lint-staged": {
     "*.ts": [
@@ -155,5 +156,10 @@
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
     }
+  },
+  "pnpm": {
+    "overrides": {
+      "axios": "next"
+    }
   }
 }