updated meteor-integration

Author: cdmbase

app/.meteor/versions

@@ -10,7 +10,7 @@ aldeed:schema-deny@1.1.0
 aldeed:schema-index@1.1.0
 aldeed:simple-schema@1.5.3
 allow-deny@1.0.5
-apollo@0.2.1
+apollo@0.3.1
 autoupdate@1.3.12
 babel-compiler@6.13.0
 babel-runtime@1.0.1

app/package.json

@@ -13,28 +13,29 @@
     "prestart": "npm run generate-graphql-documents; npm run generate-graphql-types"
   },
   "dependencies": {
-    "apollo-client": "^0.5.0",
-    "apollo-client-rxjs": "^0.2.4",
-    "bcrypt": "^0.8.7",
+    "apollo-client": "^0.8.4",
+    "apollo-client-rxjs": "^0.5.1",
+    "bcrypt": "^1.0.2",
     "bluebird": "^3.4.1",
     "body-parser": "^1.15.2",
     "bootstrap": "^3.3.7",
     "cdm-logger": "1.0.7",
-    "cheerio": "^0.20.0",
+    "cheerio": "^0.22.0",
     "cookie-monster": "^0.2.0",
     "cookie-parser": "^1.4.3",
     "dataloader": "^1.2.0",
-    "deepmerge": "^0.2.10",
+    "deepmerge": "^1.3.2",
     "diff-match-patch": "^1.0.0",
     "express": "^4.14.0",
     "formatjs": "^0.1.1",
-    "graphql": "^0.8.2",
+    "graphql": "^0.9.1",
+    "graphql-anywhere": "^2.2.0",
     "graphql-custom-types": "^0.7.1",
     "graphql-schema-collector": "0.2.4",
-    "graphql-server-express": "^0.4.3",
-    "graphql-subscriptions": "^0.2.2",
-    "graphql-tag": "1.2.1",
-    "graphql-tools": "^0.8.4",
+    "graphql-server-express": "^0.6.0",
+    "graphql-subscriptions": "^0.3.0",
+    "graphql-tag": "1.2.4",
+    "graphql-tools": "^0.10.0",
     "graphql-typings": "0.0.1-beta-2",
     "immutable": "^3.8.1",
     "intl-locales-supported": "^1.0.0",
@@ -48,12 +49,13 @@
     "meteor-node-stubs": "^0.2.3",
     "mime": "^1.3.4",
     "nconf": "^0.8.4",
-    "node-sass": "^3.8.0",
-    "ramda": "^0.22.1",
+    "node-sass": "^4.5.0",
+    "persistgraphql": "^0.2.10",
+    "ramda": "^0.23.0",
     "randomstring": "^1.1.5",
     "raven-js": "^3.3.0",
     "react": "^15.4.0",
-    "react-ace": "^3.6.1",
+    "react-ace": "^4.1.4",
     "react-addons-create-fragment": "^15.3.0",
     "react-addons-css-transition-group": "^15.3.0",
     "react-addons-linked-state-mixin": "^15.3.0",
@@ -62,49 +64,48 @@
     "react-addons-test-utils": "^15.3.0",
     "react-addons-transition-group": "^15.3.0",
     "react-addons-update": "^15.3.0",
-    "react-apollo": "^0.7.0",
+    "react-apollo": "^0.10.0",
     "react-bootstrap": "^0.30.2",
-    "react-codemirror": "^0.2.6",
+    "react-codemirror": "^0.3.0",
     "react-cookie": "^1.0.4",
     "react-dom": "^15.2.0",
     "react-ga": "^2.1.2",
-    "react-helmet": "^3.1.0",
+    "react-helmet": "^4.0.0",
     "react-intl": "^2.1.3",
     "react-komposer": "^2.0.0",
     "react-loader": "^2.4.0",
     "react-mixin": "^3.0.5",
     "react-pure-render": "^1.0.2",
-    "react-redux": "^4.4.5",
-    "react-redux-transaction": "0.0.9",
+    "react-redux": "^5.0.2",
     "react-router": "^3.0.0",
     "react-router-bootstrap": "^0.23.1",
     "react-router-redux": "^4.0.7",
     "rebass": "^0.3.3",
-    "recompose": "^0.20.2",
+    "recompose": "^0.22.0",
     "redux": "^3.5.2",
     "redux-devtools": "^3.3.1",
     "redux-devtools-dock-monitor": "^1.1.1",
     "redux-devtools-log-monitor": "^1.0.11",
     "redux-logger": "^2.6.1",
-    "redux-observable": "^0.12.2",
-    "redux-persist": "^3.5.0",
+    "redux-observable": "^0.13.0",
+    "redux-persist": "^4.3.0",
     "redux-storage": "^4.1.0",
     "redux-storage-decorator-debounce": "^1.0.1",
     "redux-storage-engine-localstorage": "^1.1.1",
     "redux-thunk": "^2.1.0",
     "redux-transaction": "0.0.5",
     "reflexbox": "^2.1.0",
     "rxjs": "^5.0.1",
-    "sass-loader": "^4.0.0",
+    "sass-loader": "^5.0.1",
     "shortid": "^2.2.6",
-    "subscriptions-transport-ws": "^0.3.1",
+    "subscriptions-transport-ws": "^0.5.1",
     "tracker-component": "^1.3.21",
-    "transit-immutable-js": "^0.6.0",
+    "transit-immutable-js": "^0.7.0",
     "transit-js": "^0.8.846",
-    "validator": "^5.5.0"
+    "validator": "^6.2.1"
   },
   "devDependencies": {
-    "apollo-codegen": "^0.9.6",
+    "apollo-codegen": "^0.10.6",
     "babel": "^6.3.26",
     "babel-core": "^6.6.0",
     "babel-eslint": "^7.1.1",
@@ -118,22 +119,22 @@
     "babel-preset-react": "^6.3.13",
     "babel-preset-stage-0": "^6.3.13",
     "babel-runtime": "^6.18.0",
-    "css-loader": "^0.23.0",
+    "css-loader": "^0.26.1",
     "enzyme": "^2.4.1",
     "eslint": "^3.12.2",
-    "eslint-config-airbnb": "^13.0.0",
+    "eslint-config-airbnb": "^14.1.0",
     "eslint-import-resolver-meteor": "^0.3.4",
     "eslint-plugin-flowtype": "^2.29.0",
     "eslint-plugin-fp": "^2.2.0",
-    "eslint-plugin-graphql": "^0.4.3",
+    "eslint-plugin-graphql": "^0.6.0",
     "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-jsx-a11y": "^2.2.3",
+    "eslint-plugin-jsx-a11y": "^4.0.0",
     "eslint-plugin-meteor": "^4.0.1",
     "eslint-plugin-react": "^6.8.0",
     "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^1.0.0",
     "file-loader": "^0.8.5",
-    "flow-bin": "^0.32.0",
+    "flow-bin": "^0.39.0",
     "graphql-document-collector": "^0.1.1",
     "html-loader": "^0.4.0",
     "json-loader": "^0.5.4",
@@ -143,12 +144,12 @@
     "react-transform-hmr": "^1.0.1",
     "redbox-react": "^1.2.0",
     "style-loader": "^0.13.0",
-    "ts-loader": "^0.8.1",
-    "typescript": "^1.8.7",
+    "ts-loader": "^2.0.0",
+    "typescript": "^2.1.6",
     "typings": "^2.0.0",
     "url-loader": "^0.5.7",
     "source-map-support": "^0.4.9",
-    "webpack": "^1.13.0",
+    "webpack": "^2.2.1",
     "webpack-hot-middleware": "^2.4.1"
   }
 }

app/packages/meteor-integration/.babelrc

@@ -5,21 +5,26 @@ import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 import { _ } from 'meteor/underscore';
 import { print } from 'graphql-tag/printer';
-import { Client } from 'subscriptions-transport-ws';
+import { SubscriptionClient, addGraphQLSubscriptions } from 'subscriptions-transport-ws';
 
 const defaultNetworkInterfaceConfig = {
   path: '/graphql', // default graphql server endpoint
   opts: {}, // additional fetch options like `credentials` or `headers`
   useMeteorAccounts: true, // if true, send an eventual Meteor login token to identify the current user with every request
   batchingInterface: true, // use a BatchingNetworkInterface by default instead of a NetworkInterface
   batchInterval: 10, // default batch interval
+  useSubscription: true, // enable subscription by default
 };
 
-const getDefaultWsClient = () => new Client('ws://localhost:8080');
+const getDefaultWsClient = () => new SubscriptionClient('ws://localhost:8080', {
+  reconnect: true,
+  // connectionParams: {
+  //   // Pass any arguments you want for initialization
+  // },
+});
 
 export const createMeteorNetworkInterface = (givenConfig) => {
   const config = _.extend(defaultNetworkInterfaceConfig, givenConfig);
-  const wsClient = givenConfig && givenConfig.wsClient ? givenConfig.wsClient : getDefaultWsClient();
   // absoluteUrl adds a '/', so let's remove it first
   let path = config.path;
   if (path[0] === '/') {
@@ -30,17 +35,17 @@ export const createMeteorNetworkInterface = (givenConfig) => {
   const interfaceToUse = config.batchingInterface ? createBatchingNetworkInterface : createNetworkInterface;
 
   // default interface options
-  let interfaceOptions = {
+  const interfaceOptions = {
     uri: Meteor.absoluteUrl(path),
   };
 
   // if a BatchingNetworkInterface is used with a correct batch interval, add it to the options
-  if(config.batchingInterface && config.batchInterval) {
+  if (config.batchingInterface && config.batchInterval) {
     interfaceOptions.batchInterval = config.batchInterval;
   }
 
   // if 'fetch' has been configured to be called with specific opts, add it to the options
-  if(!_.isEmpty(config.opts)) {
+  if (!_.isEmpty(config.opts)) {
     interfaceOptions.opts = config.opts;
   }
 
@@ -49,7 +54,6 @@ export const createMeteorNetworkInterface = (givenConfig) => {
   if (config.useMeteorAccounts) {
     networkInterface.use([{
       applyMiddleware(request, next) {
-
         // cookie login token created by meteorhacks:fast-render and caught during server-side rendering by rr:react-router-ssr
         const { loginToken: cookieLoginToken } = config;
         // Meteor accounts-base login token stored in local storage, only exists client-side
@@ -82,31 +86,24 @@ export const createMeteorNetworkInterface = (givenConfig) => {
   }
 
   if (config.useSubscription) {
-    return _.extend(networkInterface, {
-      subscribe: (request, handler) => wsClient.subscribe({
-        query: print(request.query),
-        variables: request.variables,
-      }, handler),
-      unsubscribe: (id) => {
-        wsClient.unsubscribe(id);
-      },
-    });
+    const wsClient = givenConfig && givenConfig.wsClient ? givenConfig.wsClient : getDefaultWsClient();
+    return addGraphQLSubscriptions(networkInterface, wsClient);
+    // return _.extend(networkInterface, {
+    //   subscribe: (request, handler) => wsClient.subscribe({
+    //     query: print(request.query),
+    //     variables: request.variables,
+    //   }, handler),
+    //   unsubscribe: (id) => {
+    //     wsClient.unsubscribe(id);
+    //   },
+    // });
   }
   return networkInterface;
 };
 
 export const meteorClientConfig = (networkInterfaceConfig) => {
-  const networkInterface = createMeteorNetworkInterface(networkInterfaceConfig);
-  let { initialState } = networkInterface;
-  if(initialState){
-    // Temporary workaround for bug in AC@0.5.0: https://github.com/apollostack/apollo-client/issues/845
-    delete initialState.apollo.queries;
-    delete initialState.apollo.mutations;
-  }
-
   return {
-    networkInterface,
-    initialState,
+    networkInterface: createMeteorNetworkInterface(networkInterfaceConfig),
     ssrMode: Meteor.isServer,
 
     // Default to using Mongo _id, must use _id for queries.

app/packages/meteor-integration/main-client.js

@@ -16,14 +16,14 @@ export { createMeteorNetworkInterface, meteorClientConfig } from './main-client'
 const defaultConfig = {
   path: '/graphql',
   maxAccountsCacheSizeInMB: 1,
-  graphiql : Meteor.isDevelopment,
-  graphiqlPath : '/graphiql',
-  graphiqlOptions : {
-    passHeader : "'Authorization': localStorage['Meteor.loginToken']"
+  graphiql: Meteor.isDevelopment,
+  graphiqlPath: '/graphiql',
+  graphiqlOptions: {
+    passHeader: "'Authorization': localStorage['Meteor.loginToken']"
   },
   useSubscription: true,
   subscriptionPort: 8080,
-  configServer: (graphQLServer) => {},
+  configServer: (graphQLServer) => { },
 };
 
 const defaultOptions = {
@@ -51,7 +51,7 @@ export const createApolloServer = (givenOptions = {}, givenConfig = {}) => {
   // GraphQL endpoint
   graphQLServer.use(config.path, bodyParser.json(), graphqlExpress(async (req) => {
     let options,
-        user = null;
+      user = null;
 
     if (_.isFunction(givenOptions))
       options = givenOptions(req);
@@ -75,7 +75,7 @@ export const createApolloServer = (givenOptions = {}, givenConfig = {}) => {
 
       // Get the user from the database
       user = await Meteor.users.findOne(
-        {"services.resume.loginTokens.hashedToken": hashedToken}
+        { "services.resume.loginTokens.hashedToken": hashedToken }
       );
 
       if (user) {
@@ -95,11 +95,9 @@ export const createApolloServer = (givenOptions = {}, givenConfig = {}) => {
 
   // Start GraphiQL if enabled
   if (config.graphiql) {
-    graphQLServer.use(config.graphiqlPath, graphiqlExpress(_.extend(config.graphiqlOptions, {endpointURL : config.path})));
+    graphQLServer.use(config.graphiqlPath, graphiqlExpress(_.extend(config.graphiqlOptions, { endpointURL: config.path })));
   }
 
-  // create http server for subscription
-  const server = createServer(graphQLServer);
 
   // This binds the specified paths to the Express server running Apollo + GraphiQL
   WebApp.connectHandlers.use(Meteor.bindEnvironment(graphQLServer));
@@ -109,13 +107,23 @@ export const createApolloServer = (givenOptions = {}, givenConfig = {}) => {
     if (!subscriptionManager) {
       throw new Meteor.Error('SubscriptionManager which is mandatory missing.');
     }
-    new SubscriptionServer({
-      subscriptionManager,
-    }, server);
     try {
+      // create http server for subscription
+      // const server = createServer(graphQLServer);
+      // Create WebSocket listener server
+      const server = createServer((request, response) => {
+        response.writeHead(404);
+        response.end();
+      });
       server.listen(config.subscriptionPort, () => {
         console.log('Subscription manager running ' + config.subscriptionPort);
       });
+      const subscriptionServer = new SubscriptionServer({
+        subscriptionManager,
+      }, {
+          server,
+          path: '/'
+        });
     } catch (e) {
       console.log(e);
     }

app/packages/meteor-integration/main-server.js

@@ -20,13 +20,6 @@
   "homepage": "https://github.com/apollostack/meteor-integration#readme",
   "dependencies": {
     "apollo-client": "^0.8.4",
-    "babel": "^6.5.2",
-    "babel-core": "^6.22.1",
-    "babel-eslint": "^7.1.1",
-    "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-preset-es2015": "^6.22.0",
-    "babel-preset-stage-2": "^6.22.0",
-    "body-parser": "^1.15.2",
     "express": "^4.14.0",
     "graphql": "^0.9.1",
     "graphql-server-express": "^0.6.0",

app/packages/meteor-integration/package.json

@@ -3,7 +3,7 @@ import { _ } from 'meteor/underscore';
 
 const requiredPackages = {
   'react-router': '^3.0.0',
-  graphql: '^0.8.2',
+  graphql: '^0.9.0',
 };
 
 

app/packages/react-runtime-additional/react-runtime-additional.js

@@ -0,0 +1,12 @@
+import { PersistedQueryNetworkInterface } from 'persistgraphql';
+
+
+// Returns either a standard, fetch-full-query network interface or a
+// persisted query network interface (from `extractgql`) depending on
+// the configuration within `./config.js.`
+export default function getNetworkInterface(apirUrl = '/graphql', headers = {}) {
+    uri: apiUrl,
+    opts: {
+        
+    }
+}