chore: fix merge conflict

jpedroh · May 6, 2021 · 445ff87 · 445ff87
2 parents e04ed50 + c91495a
commit 445ff87
Show file tree

Hide file tree

Showing 17 changed files with 142 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 4.1.5 (2021-04-29)
+
+**Note:** Version bump only for package root
+
+
+
+
+
+## 4.1.4 (2021-04-29)
+
+**Note:** Version bump only for package root
+
+
+
+
+
 ## 4.1.3 (2021-04-28)
 
 **Note:** Version bump only for package root

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "4.1.3",
+  "version": "4.1.5",
   "packages": [
     "packages/*"
   ],

diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 4.1.5 (2021-04-29)
+
+**Note:** Version bump only for package @mach/common
+
+
+
+
+
+## 4.1.4 (2021-04-29)
+
+**Note:** Version bump only for package @mach/common
+
+
+
+
+
 ## 4.1.3 (2021-04-28)
 
 **Note:** Version bump only for package @mach/common

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mach/common",
-  "version": "4.1.3",
+  "version": "4.1.5",
   "description": "> TODO: description",
   "author": "Joao Pedro Henrique <[email protected]>",
   "homepage": "https://github.com/jpedroh/mach#readme",

diff --git a/packages/database/CHANGELOG.md b/packages/database/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 4.1.5 (2021-04-29)
+
+**Note:** Version bump only for package @mach/database
+
+
+
+
+
+## 4.1.4 (2021-04-29)
+
+**Note:** Version bump only for package @mach/database
+
+
+
+
+
 ## 4.1.3 (2021-04-28)
 
 **Note:** Version bump only for package @mach/database

diff --git a/packages/database/package.json b/packages/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mach/database",
-  "version": "4.1.3",
+  "version": "4.1.5",
   "description": "> TODO: description",
   "author": "Joao Pedro Henrique <[email protected]>",
   "homepage": "https://github.com/jpedroh/mach#readme",
@@ -23,7 +23,7 @@
     "url": "https://github.com/jpedroh/mach/issues"
   },
   "dependencies": {
-    "@mach/common": "^4.1.3",
+    "@mach/common": "^4.1.5",
     "pg": "^8.3.0",
     "pg-hstore": "^2.3.3",
     "sequelize": "^6.3.4"

diff --git a/packages/eslint-config/CHANGELOG.md b/packages/eslint-config/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 4.1.5 (2021-04-29)
+
+**Note:** Version bump only for package @mach/eslint-config
+
+
+
+
+
+## 4.1.4 (2021-04-29)
+
+**Note:** Version bump only for package @mach/eslint-config
+
+
+
+
+
 ## 4.1.3 (2021-04-28)
 
 **Note:** Version bump only for package @mach/eslint-config

diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mach/eslint-config",
-  "version": "4.1.3",
+  "version": "4.1.5",
   "main": ".eslintrc.js",
   "license": "MIT",
   "devDependencies": {

diff --git a/packages/front/CHANGELOG.md b/packages/front/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 4.1.5 (2021-04-29)
+
+**Note:** Version bump only for package @mach/front
+
+
+
+
+
+## 4.1.4 (2021-04-29)
+
+**Note:** Version bump only for package @mach/front
+
+
+
+
+
 ## 4.1.3 (2021-04-28)
 
 **Note:** Version bump only for package @mach/front

diff --git a/packages/front/package.json b/packages/front/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@mach/front",
-  "version": "4.1.3",
+  "version": "4.1.5",
   "private": true,
   "scripts": {
     "dev": "next dev",
     "build": "next build",
     "start": "next start"
   },
   "dependencies": {
-    "@mach/common": "^4.1.3",
+    "@mach/common": "^4.1.5",
     "bootstrap": "^4.5.2",
     "next": "^10.2.0",
     "react": "^17.0.2",

diff --git a/packages/prettier-config/CHANGELOG.md b/packages/prettier-config/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 4.1.5 (2021-04-29)
+
+**Note:** Version bump only for package @mach/prettier-config
+
+
+
+
+
+## 4.1.4 (2021-04-29)
+
+**Note:** Version bump only for package @mach/prettier-config
+
+
+
+
+
 ## 4.1.3 (2021-04-28)
 
 **Note:** Version bump only for package @mach/prettier-config

diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mach/prettier-config",
-  "version": "4.1.3",
+  "version": "4.1.5",
   "main": "prettier.config.js",
   "license": "MIT",
   "devDependencies": {

diff --git a/packages/rest-api/CHANGELOG.md b/packages/rest-api/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 4.1.5 (2021-04-29)
+
+**Note:** Version bump only for package @mach/rest-api
+
+
+
+
+
+## 4.1.4 (2021-04-29)
+
+**Note:** Version bump only for package @mach/rest-api
+
+
+
+
+
 ## 4.1.3 (2021-04-28)
 
 **Note:** Version bump only for package @mach/rest-api

diff --git a/packages/rest-api/package.json b/packages/rest-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mach/rest-api",
   "private": true,
-  "version": "4.1.3",
+  "version": "4.1.5",
   "description": "> TODO: description",
   "author": "Joao Pedro Henrique <[email protected]>",
   "homepage": "https://github.com/jpedroh/mach#readme",
@@ -21,8 +21,8 @@
     "url": "https://github.com/jpedroh/mach/issues"
   },
   "dependencies": {
-    "@mach/common": "^4.1.3",
-    "@mach/database": "^4.1.3",
+    "@mach/common": "^4.1.5",
+    "@mach/database": "^4.1.5",
     "express": "^4.17.1"
   },
   "devDependencies": {

diff --git a/packages/rpl-crawler/CHANGELOG.md b/packages/rpl-crawler/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 4.1.5 (2021-04-29)
+
+**Note:** Version bump only for package @mach/rpl-crawler
+
+
+
+
+
+## 4.1.4 (2021-04-29)
+
+**Note:** Version bump only for package @mach/rpl-crawler
+
+
+
+
+
 ## 4.1.3 (2021-04-28)
 
 **Note:** Version bump only for package @mach/rpl-crawler

diff --git a/packages/rpl-crawler/package.json b/packages/rpl-crawler/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mach/rpl-crawler",
   "private": true,
-  "version": "4.1.3",
+  "version": "4.1.5",
   "main": "dist/index.js",
   "files": [
     "dist"
@@ -13,8 +13,8 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@mach/common": "^4.1.3",
-    "@mach/database": "^4.1.3",
+    "@mach/common": "^4.1.5",
+    "@mach/database": "^4.1.5",
     "adm-zip": "^0.4.16",
     "axios": "^0.21.1"
   },

diff --git a/yarn.lock b/yarn.lock
@@ -1780,14 +1780,6 @@
     "@typescript-eslint/typescript-estree" "4.22.1"
     debug "^4.1.1"
 
-"@typescript-eslint/[email protected]":
-  version "4.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz#ed411545e61161a8d702e703a4b7d96ec065b09a"
-  integrity sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==
-  dependencies:
-    "@typescript-eslint/types" "4.22.0"
-    "@typescript-eslint/visitor-keys" "4.22.0"
-
 "@typescript-eslint/[email protected]":
   version "4.22.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.1.tgz#5bb357f94f9cd8b94e6be43dd637eb73b8f355b4"
@@ -1796,29 +1788,11 @@
     "@typescript-eslint/types" "4.22.1"
     "@typescript-eslint/visitor-keys" "4.22.1"
 
-"@typescript-eslint/[email protected]":
-  version "4.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.0.tgz#0ca6fde5b68daf6dba133f30959cc0688c8dd0b6"
-  integrity sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==
-
 "@typescript-eslint/[email protected]":
   version "4.22.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.1.tgz#bf99c6cec0b4a23d53a61894816927f2adad856a"
   integrity sha512-2HTkbkdAeI3OOcWbqA8hWf/7z9c6gkmnWNGz0dKSLYLWywUlkOAQ2XcjhlKLj5xBFDf8FgAOF5aQbnLRvgNbCw==
 
-"@typescript-eslint/[email protected]":
-  version "4.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz#b5d95d6d366ff3b72f5168c75775a3e46250d05c"
-  integrity sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==
-  dependencies:
-    "@typescript-eslint/types" "4.22.0"
-    "@typescript-eslint/visitor-keys" "4.22.0"
-    debug "^4.1.1"
-    globby "^11.0.1"
-    is-glob "^4.0.1"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
-
 "@typescript-eslint/[email protected]":
   version "4.22.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.1.tgz#dca379eead8cdfd4edc04805e83af6d148c164f9"
@@ -1832,14 +1806,6 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/[email protected]":
-  version "4.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz#169dae26d3c122935da7528c839f42a8a42f6e47"
-  integrity sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==
-  dependencies:
-    "@typescript-eslint/types" "4.22.0"
-    eslint-visitor-keys "^2.0.0"
-
 "@typescript-eslint/[email protected]":
   version "4.22.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.1.tgz#6045ae25a11662c671f90b3a403d682dfca0b7a6"