Merge #1913 #2028

1913: fix: update dependency apollo-server-express to v3 (master) r=ZauberNerd a=renovate[bot] [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) 2028: chore: update dependency husky to v7 (master) r=ZauberNerd a=renovate[bot] [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Robert Kowalski <[email protected]> Co-authored-by: Philipp Hinrichsen <[email protected]>
xing · Feb 17, 2022 · e8c3a39 · e8c3a39
3 parents 9e360c7 + 687ca03 + 0277b7b
commit e8c3a39
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 429 deletions.
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx commitlint -e $HUSKY_GIT_PARAMS
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged
diff --git a/package.json b/package.json
@@ -39,7 +39,8 @@
     "release:rollback": "yarn is-release-bot-commit && git reset --hard HEAD^",
     "release:create-nightly": "yarn release premajor --conventional-prerelease --preid nightly",
     "release:rc": "yarn release --conventional-prerelease --preid rc",
-    "release:graduate": "yarn release --conventional-graduate"
+    "release:graduate": "yarn release --conventional-graduate",
+    "prepare": "husky install"
   },
   "canarist": {
     "projects": [
@@ -97,12 +98,6 @@
       }
     ]
   },
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint -e $HUSKY_GIT_PARAMS",
-      "pre-commit": "lint-staged"
-    }
-  },
   "lint-staged": {
     "*.{js,json,css}": [
       "prettier --list-different"
@@ -259,7 +254,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.28.0",
-    "husky": "^4.3.8",
+    "husky": "^7.0.0",
     "jest": "^27.0.0",
     "jest-runner-eslint": "1.0.0",
     "jest-runner-prettier": "0.3.7",

diff --git a/packages/apollo-mock-server/lib/mock-server-middleware.js b/packages/apollo-mock-server/lib/mock-server-middleware.js
@@ -9,7 +9,7 @@ import extendContext from 'hops-apollo-mock-server/context-extender';
 
 const apolloAppPromise = Promise.resolve(
   typeof schema === 'function' ? schema() : schema
-).then((resolvedSchema) => {
+).then(async (resolvedSchema) => {
   const app = express();
   app.use(cookieParser());
 
@@ -23,6 +23,8 @@ const apolloAppPromise = Promise.resolve(
     context: (context) => extendContext({ ...context, config: hopsConfig }),
   });
 
+  await server.start();
+
   server.applyMiddleware({
     app,
     path: hopsConfig.graphqlMockServerPath,

diff --git a/packages/apollo-mock-server/package.json b/packages/apollo-mock-server/package.json
@@ -22,7 +22,7 @@
     "displayName": "unit"
   },
   "dependencies": {
-    "apollo-server-express": "^2.23.0",
+    "apollo-server-express": "^3.0.0",
     "cookie-parser": "^1.4.4",
     "cross-fetch": "^3.0.4",
     "express": "^4.17.1",