Merge branch 'master' into virtualized

client/coral-embed/src/index.js

@@ -70,10 +70,9 @@ export class Talk {
     // Extract the asset url.
     if (opts.asset_url) {
       query.asset_url = opts.asset_url;
-    } else if (!opts.asset_id) {
+    } else {
 
-      // The asset url was not provided and the asset id was also not provided,
-      // we need to infer the asset url from details on the page.
+      // The asset url was not provided so we need to infer the asset url from // details on the page.
 
       try {
         query.asset_url = document.querySelector('link[rel="canonical"]').href;

client/coral-framework/graphql/anywhere.js

@@ -0,0 +1,23 @@
+import graphql from '@coralproject/graphql-anywhere-optimized';
+import {createTypeGetter} from 'graphql-ast-tools';
+import introspectionData from './introspection.json';
+
+// Use typeGetter to get more optimized documents.
+const typeGetter = createTypeGetter(introspectionData);
+
+// Use global fragment cache for transformed fragments.
+const fragmentMap = {};
+
+export default (...args) => {
+  while (args.length < 7) {
+    args.push(undefined);
+  }
+
+  const transformOptions = {
+    typeGetter,
+    fragmentMap,
+  };
+
+  args[6] = transformOptions;
+  return graphql(...args);
+};

client/coral-framework/services/bootstrap.js

@@ -124,10 +124,6 @@ export async function createContext({
   const plugins = createPluginsService(pluginsConfig);
   const graphql = createGraphQLService(
     createGraphQLRegistry(plugins.getSlotFragments.bind(plugins)),
-    {
-      introspectionData,
-      optimize: process.env.NODE_ENV === 'production',
-    },
   );
   if (!notification) {
 

client/coral-framework/services/graphql.js

@@ -1,4 +1,3 @@
-import {transformDocument, createTypeGetter} from 'graphql-ast-tools';
 import {addTypenameToDocument} from 'apollo-client/queries/queryTransform';
 
 /**
@@ -6,18 +5,7 @@ import {addTypenameToDocument} from 'apollo-client/queries/queryTransform';
  * @param  {string}  basename  base path of the url
  * @return {Object}  histor service
  */
-export function createGraphQLService(registry, {
-  introspectionData,
-  optimize = false,
-}) {
-  const transformOptions = {
-    typeGetter: optimize && introspectionData ? createTypeGetter(introspectionData) : null,
-
-    // Use shared fragment map.
-    // Attention: Fragment names must be unique otherwise weird things will happen.
-    fragmentMap: {},
-  };
-
+export function createGraphQLService(registry) {
   return {
     registry,
     resolveDocument(documentOrCallback, props, context) {
@@ -26,10 +14,6 @@ export function createGraphQLService(registry, {
         : documentOrCallback;
       document = registry.resolveFragments(document);
 
-      if (optimize) {
-        document = transformDocument(document, transformOptions);
-      }
-
       // We also add typenames to the document which apollo would usually do,
       // but we also use the network interface in subscriptions directly
       // which require the resolved typenames.

docs/_docs/01-01-talk-quickstart.md

@@ -26,7 +26,7 @@ to persist data. The following versions are supported:
 
 An optional dependency for Talk is
 [Docker](https://www.docker.com/community-edition#/download){:target="_blank"}.
-It is used during [development](#development) to setup the database and can be
+It is used during [development](#development) to set up the database and can be
 used to [install via Docker](#installation-from-docker).  We have tested Talk
 and this documentation with versions {{ site.versions.docker }}.
 
@@ -182,4 +182,4 @@ machine.
 
 At this point you've successfully installed, configured, and ran your very own
 instance of Talk! Continue through this documentation on this site to learn more
-on how to configure, develop with, and contribute to Talk!
+on how to configure, develop with, and contribute to Talk!

package.json

@@ -106,7 +106,7 @@
     "fs-extra": "^4.0.1",
     "gql-merge": "^0.0.4",
     "graphql": "^0.9.1",
-    "graphql-ast-tools": "^0.1.5",
+    "graphql-ast-tools": "0.2.3",
     "graphql-docs": "0.2.0",
     "graphql-errors": "^2.1.0",
     "graphql-redis-subscriptions": "1.3.0",

webpack.config.js

@@ -120,7 +120,7 @@ const config = {
   },
   resolve: {
     alias: {
-      'graphql-anywhere': '@coralproject/graphql-anywhere-optimized',
+      'graphql-anywhere': path.resolve(__dirname, 'client/coral-framework/graphql/anywhere'),
       'plugin-api': path.resolve(__dirname, 'plugin-api/'),
       plugins: path.resolve(__dirname, 'plugins/'),
       pluginsConfig: pluginsPath

yarn.lock

@@ -12,10 +12,10 @@
     eslint-plugin-react "^7.3.0"
 
 "@coralproject/graphql-anywhere-optimized@^0.1.0":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@coralproject/graphql-anywhere-optimized/-/graphql-anywhere-optimized-0.1.3.tgz#f92f3906bb04f001aef725697237786752c49bd6"
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@coralproject/graphql-anywhere-optimized/-/graphql-anywhere-optimized-0.1.5.tgz#67c862bf908ea717d9521ea76266b5bc9f109c65"
   dependencies:
-    graphql-ast-tools "^0.1.6"
+    graphql-ast-tools "^0.2.2"
 
 "@kadira/storybook-deployer@^1.1.0":
   version "1.2.0"
@@ -3521,9 +3521,9 @@ graphql-anywhere@^3.0.1:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-3.1.0.tgz#3ea0d8e8646b5cee68035016a9a7557c15c21e96"
 
-graphql-ast-tools@^0.1.5, graphql-ast-tools@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/graphql-ast-tools/-/graphql-ast-tools-0.1.6.tgz#48eb656434bf4c7dba2a0d4784f1fdb988ab70ed"
+graphql-ast-tools@0.2.3, graphql-ast-tools@^0.2.2:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/graphql-ast-tools/-/graphql-ast-tools-0.2.3.tgz#447fb05905ebb90f0a5bba81d5715249e9937135"
   dependencies:
     apollo-utilities "^1.0.3"