From 09cf2cd4ff9b904ca0ae809c669724392d11e077 Mon Sep 17 00:00:00 2001 From: Alexis Tyler Date: Sat, 17 Aug 2019 14:13:49 +0930 Subject: [PATCH] update @unraid/core and move pubsub to core Signed-off-by: Alexis Tyler --- app/graphql/schema/pubsub.js | 11 ----------- app/graphql/schema/resolvers.js | 4 ++-- package.json | 2 +- yarn.lock | 6 ++++-- 4 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 app/graphql/schema/pubsub.js diff --git a/app/graphql/schema/pubsub.js b/app/graphql/schema/pubsub.js deleted file mode 100644 index a6aa67629..000000000 --- a/app/graphql/schema/pubsub.js +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2019 Lime Technology Inc. All rights reserved. - * Written by: Alexis Tyler - */ - -module.exports = function ($injector) { - const { PubSub } = $injector.resolve('apollo-server'); - const pubsub = new PubSub(); - - return pubsub; -}; \ No newline at end of file diff --git a/app/graphql/schema/resolvers.js b/app/graphql/schema/resolvers.js index 912c90544..7a556bf5f 100644 --- a/app/graphql/schema/resolvers.js +++ b/app/graphql/schema/resolvers.js @@ -21,8 +21,8 @@ module.exports = function (GraphQLJSON, GraphQLLong, GraphQLUUID, pubsub) { }; // // Recieve test messages. - // pubsub.subscribe('ping', (...rest) => { - // console.log(`CHANNEL: ping DATA: ${JSON.stringify(rest, null, 2)}`); + // pubsub.subscribe('users', (...rest) => { + // console.log(`CHANNEL: users DATA: ${JSON.stringify(rest, null, 2)}`); // }) return { diff --git a/package.json b/package.json index 0d9c97afa..6759d4b16 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "dev": "STATES_CWD=$(pwd)/../core/test/fixtures/states CORE_CWD=$(pwd)/../core/ PLUGINS_CWD=$(pwd)/../plugins/ nodemon -e js,graphql --signal SIGINT index.js" }, "dependencies": { - "@unraid/core": "unraid/core#3639d66", + "@unraid/core": "unraid/core#2c9580c", "accesscontrol": "^2.2.1", "am": "^1.0.1", "apollo-datasource-rest": "^0.6.1", diff --git a/yarn.lock b/yarn.lock index cc65421ab..eadee650f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -362,11 +362,12 @@ dependencies: "@types/node" "*" -"@unraid/core@unraid/core#3639d66": +"@unraid/core@unraid/core#2c9580c": version "1.0.0" - resolved "git+ssh://git@github.com/unraid/core.git#3639d6608c992deb409d3880359f243f5b52b537" + resolved "git+ssh://git@github.com/unraid/core.git#2c9580cc8c358c2d157c99d58d143cd541684471" dependencies: accesscontrol "^2.2.1" + apollo-server "^2.8.1" bcryptjs "^2.4.3" better-stack-traces "^1.1.0" bolus OmgImAlexis/bolus#71e4d3c @@ -388,6 +389,7 @@ get-server-address "^1.0.1" glob "^7.1.4" globby "^9.2.0" + graphql "^14.4.2" htpasswd-js "^1.0.2" ini "^1.3.5" is-plain-object "^3.0.0"