Merge pull request #920 from blackflux/dev

[Gally]: master <- dev

.circleci/config.yml

@@ -3,7 +3,7 @@ workflows:
   node-multi-build:
     jobs:
       - gally-create-pr
-      - test-node-v15:
+      - test-node-v16:
           requires:
             - gally-create-pr
       - test-node-v14:
@@ -15,7 +15,7 @@ workflows:
       - gally-auto-approve:
           requires:
             - gally-create-pr
-            - test-node-v15
+            - test-node-v16
             - test-node-v14
             - test-node-v12
           filters:
@@ -24,7 +24,7 @@ workflows:
       - release:
           requires:
             - gally-create-pr
-            - test-node-v15
+            - test-node-v16
             - test-node-v14
             - test-node-v12
           filters:
@@ -34,14 +34,14 @@ version: 2
 jobs:
   gally-create-pr:
     docker:
-      - image: 'circleci/node:14'
+      - image: circleci/node:14
     steps:
       - checkout
       - run: sudo yarn global add gally
       - run: ga promote $CIRCLE_BRANCH
   test-node-v12:
     docker:
-      - image: 'circleci/node:12'
+      - image: circleci/node:12
     steps:
       - checkout
       - run:
@@ -58,13 +58,13 @@ jobs:
       - restore_cache:
           name: Restore Yarn Package Cache
           keys:
-            - 'yarn-packages-{{ checksum "yarn.lock" }}'
+            - yarn-packages-{{ checksum "yarn.lock" }}
       - run:
           name: Install Dependencies
           command: yarn install --frozen-lockfile
       - save_cache:
           name: Save Yarn Package Cache
-          key: 'yarn-packages-{{ checksum "yarn.lock" }}'
+          key: yarn-packages-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache/yarn
       - run: yarn test
@@ -73,7 +73,7 @@ jobs:
           1);
   release:
     docker:
-      - image: 'circleci/node:14'
+      - image: circleci/node:14
     steps:
       - checkout
       - run:
@@ -90,19 +90,19 @@ jobs:
       - restore_cache:
           name: Restore Yarn Package Cache
           keys:
-            - 'yarn-packages-{{ checksum "yarn.lock" }}'
+            - yarn-packages-{{ checksum "yarn.lock" }}
       - run:
           name: Install Dependencies
           command: yarn install --frozen-lockfile
       - save_cache:
           name: Save Yarn Package Cache
-          key: 'yarn-packages-{{ checksum "yarn.lock" }}'
+          key: yarn-packages-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache/yarn
       - run: yarn run semantic-release
   gally-auto-approve:
     docker:
-      - image: 'circleci/node:14'
+      - image: circleci/node:14
     steps:
       - run:
           name: Set PR number
@@ -121,7 +121,7 @@ jobs:
           "base.ref=dev&state=open&user.login=dependabot-preview[bot]"
   test-node-v14:
     docker:
-      - image: 'circleci/node:14'
+      - image: circleci/node:14
     steps:
       - checkout
       - run:
@@ -138,13 +138,13 @@ jobs:
       - restore_cache:
           name: Restore Yarn Package Cache
           keys:
-            - 'yarn-packages-{{ checksum "yarn.lock" }}'
+            - yarn-packages-{{ checksum "yarn.lock" }}
       - run:
           name: Install Dependencies
           command: yarn install --frozen-lockfile
       - save_cache:
           name: Save Yarn Package Cache
-          key: 'yarn-packages-{{ checksum "yarn.lock" }}'
+          key: yarn-packages-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache/yarn
       - run: yarn test
@@ -156,9 +156,9 @@ jobs:
             if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
               yarn run coveralls
             fi
-  test-node-v15:
+  test-node-v16:
     docker:
-      - image: 'circleci/node:15'
+      - image: circleci/node:16
     steps:
       - checkout
       - run:
@@ -175,13 +175,13 @@ jobs:
       - restore_cache:
           name: Restore Yarn Package Cache
           keys:
-            - 'yarn-packages-{{ checksum "yarn.lock" }}'
+            - yarn-packages-{{ checksum "yarn.lock" }}
       - run:
           name: Install Dependencies
           command: yarn install --frozen-lockfile
       - save_cache:
           name: Save Yarn Package Cache
-          key: 'yarn-packages-{{ checksum "yarn.lock" }}'
+          key: yarn-packages-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache/yarn
       - run: yarn test

.gally.json

@@ -23,7 +23,7 @@
         "strict": true,
         "contexts": [
           "ci/circleci: gally-create-pr",
-          "ci/circleci: test-node-v15",
+          "ci/circleci: test-node-v16",
           "ci/circleci: test-node-v14",
           "ci/circleci: test-node-v12"
         ]

README.md

@@ -88,7 +88,6 @@ server.listen().then(async (serverInfo) => {
 // --- how you could sync graph api documentation to file
 
 syncDocs(path.join(__dirname, 'graph-docs.json'), server.schema);
-
 ```
 
 ## Functions

package.json

@@ -9,29 +9,29 @@
   "author": "Lukas Siemon",
   "license": "MIT",
   "devDependencies": {
-    "@babel/cli": "7.13.10",
-    "@babel/core": "7.13.10",
-    "@babel/register": "7.13.8",
+    "@babel/cli": "7.14.8",
+    "@babel/core": "7.15.0",
+    "@babel/register": "7.15.3",
     "@blackflux/eslint-plugin-rules": "2.0.3",
-    "@blackflux/robo-config-plugin": "5.0.0",
-    "apollo-server": "2.21.2",
+    "@blackflux/robo-config-plugin": "5.3.0",
+    "apollo-server": "2.25.2",
     "babel-eslint": "10.1.0",
     "babel-preset-latest-node": "5.5.1",
     "chai": "4.3.4",
-    "coveralls": "3.1.0",
-    "eslint": "7.22.0",
+    "coveralls": "3.1.1",
+    "eslint": "7.32.0",
     "eslint-config-airbnb-base": "14.2.1",
-    "eslint-plugin-import": "2.22.1",
-    "eslint-plugin-json": "2.1.2",
-    "eslint-plugin-markdown": "2.0.0",
-    "eslint-plugin-mocha": "8.1.0",
-    "graphql": "15.5.0",
+    "eslint-plugin-import": "2.24.2",
+    "eslint-plugin-json": "3.1.0",
+    "eslint-plugin-markdown": "2.2.0",
+    "eslint-plugin-mocha": "9.0.0",
+    "graphql": "15.5.2",
     "js-gardener": "3.0.3",
     "node-tdd": "3.0.4",
     "nyc": "15.1.0",
     "request": "2.88.2",
     "request-promise": "4.2.6",
-    "semantic-release": "17.4.2"
+    "semantic-release": "17.4.7"
   },
   "licenses": [
     {
@@ -111,12 +111,12 @@
     "graphql": "^14.5.3"
   },
   "dependencies": {
-    "apollo-server-errors": "2.4.2",
+    "apollo-server-errors": "3.1.0",
     "joi-strict": "2.0.0",
     "json-stable-stringify": "1.0.1",
     "lodash.get": "4.4.2",
     "lodash.set": "4.3.2",
-    "object-scan": "14.0.0",
+    "object-scan": "17.0.0",
     "painless-version": "2.0.0",
     "smart-fs": "2.0.2"
   }

test/modules/comment-version-plugin.spec.js

@@ -6,7 +6,7 @@ const get = require('lodash.get');
 const { ApolloServer } = require('apollo-server');
 const request = require('request-promise');
 const CommentVersionPlugin = require('../../src/modules/comment-version-plugin');
-const versions = require('./versions');
+const versions = require('./versions.json');
 
 describe('Testing comment-version-plugin.js', {
   envVars: {

test/modules/deprecation.spec.js

@@ -4,17 +4,15 @@ const fs = require('smart-fs');
 const expect = require('chai').expect;
 const { describe } = require('node-tdd');
 const { parse, validate } = require('graphql');
-const { ApolloServer } = require('apollo-server');
 const { getDirectories } = require('../util');
 const { getDeprecationDetails, getDeprecationMeta } = require('../../src/modules/deprecation');
-const versions = require('./versions');
+const versions = require('./versions.json');
+const { loadSchema } = require('./helper');
 
 describe('Testing deprecation.js', () => {
   let schema;
   before(() => {
-    schema = new ApolloServer({
-      typeDefs: fs.smartRead(path.join(__dirname, 'schema.graphql')).join('\n')
-    }).schema;
+    schema = loadSchema();
   });
 
   describe('Testing queries', () => {

test/modules/docs.spec.js

@@ -2,15 +2,13 @@ const path = require('path');
 const fs = require('smart-fs');
 const expect = require('chai').expect;
 const { describe } = require('node-tdd');
-const { ApolloServer } = require('apollo-server');
 const { generateDocs, syncDocs } = require('../../src/modules/docs');
+const { loadSchema } = require('./helper');
 
 describe('Testing docs.js', () => {
   let schema;
   before(() => {
-    schema = new ApolloServer({
-      typeDefs: fs.smartRead(path.join(__dirname, 'schema.graphql')).join('\n')
-    }).schema;
+    schema = loadSchema();
   });
 
   describe('Testing generateDocs', () => {

test/modules/helper.js

@@ -0,0 +1,10 @@
+const { ApolloServer } = require('apollo-server');
+const fs = require('smart-fs');
+const path = require('path');
+
+module.exports.loadSchema = () => {
+  const server = new ApolloServer({
+    typeDefs: fs.smartRead(path.join(__dirname, 'schema.graphql')).join('\n')
+  });
+  return server.schema;
+};

test/modules/require.spec.js

@@ -4,17 +4,15 @@ const fs = require('smart-fs');
 const expect = require('chai').expect;
 const { describe } = require('node-tdd');
 const { parse, validate } = require('graphql');
-const { ApolloServer } = require('apollo-server');
 const { getDirectories } = require('../util');
 const { getRequireDetails, getRequireMeta } = require('../../src/modules/require');
-const versions = require('./versions');
+const versions = require('./versions.json');
+const { loadSchema } = require('./helper');
 
 describe('Testing require.js', () => {
   let schema;
   before(() => {
-    schema = new ApolloServer({
-      typeDefs: fs.smartRead(path.join(__dirname, 'schema.graphql')).join('\n')
-    }).schema;
+    schema = loadSchema();
   });
 
   describe('Testing queries', () => {