@graphcommerce/graphql-mesh 3.0.8 → 3.1.0

package/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.1.0](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/graphql-mesh@3.0.11...@graphcommerce/graphql-mesh@3.1.0) (2021-10-20)
+
+
+### Features
+
+* **graphql-mesh:** simplified the handler to use less code in the project ([f62b752](https://github.com/ho-nl/m2-pwa/commit/f62b75249492f40c5972deede529a25a17c8a617))
+
+
+
+
+
+## [3.0.11](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/graphql-mesh@3.0.10...@graphcommerce/graphql-mesh@3.0.11) (2021-10-20)
+
+
+### Bug Fixes
+
+* **recaptcha:** allow and forward the the X-ReCaptcha to Magento ([2f3170e](https://github.com/ho-nl/m2-pwa/commit/2f3170e0f1652d84948b69a446634ffe02f08f80))
+
+
+
+
+
+## [3.0.9](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/graphql-mesh@3.0.8...@graphcommerce/graphql-mesh@3.0.9) (2021-10-18)
+
+
+### Bug Fixes
+
+* add cache-inmemory-lru ([2cd23a4](https://github.com/ho-nl/m2-pwa/commit/2cd23a40c8a2b02175b160aa9ce0b695c88c12f7))
+* graphql-mesh missing inmemory lru ([6c71c25](https://github.com/ho-nl/m2-pwa/commit/6c71c256911072ace19037616e0ce2ab478bf070))
+
+
+
+
+
 ## [3.0.1](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/graphql-mesh@3.0.0...@graphcommerce/graphql-mesh@3.0.1) (2021-09-27)
 
 **Note:** Version bump only for package @graphcommerce/graphql-mesh

package/createHandler.ts

@@ -1,4 +1,6 @@
-import { MeshInstance } from '@graphql-mesh/runtime'
+import { processConfig } from '@graphql-mesh/config'
+import { getMesh as getGraphQLMesh, MeshInstance } from '@graphql-mesh/runtime'
+import { MeshStore, InMemoryStoreStorageAdapter } from '@graphql-mesh/store'
 import { YamlConfig } from '@graphql-mesh/types'
 import { ApolloServerPluginLandingPageGraphQLPlayground } from 'apollo-server-core'
 import { ApolloServer } from 'apollo-server-micro'
@@ -6,41 +8,14 @@ import '@graphql-mesh/transform-filter-schema'
 import '@graphql-mesh/graphql'
 import '@graphql-mesh/merger-stitching'
 import '@graphql-mesh/transform-cache'
+import '@graphql-mesh/cache-inmemory-lru'
 import 'ts-tiny-invariant'
 import 'micro'
 import cors from 'micro-cors'
 
-export function injectEnv(json: YamlConfig.Config & { $schema?: string }): YamlConfig.Config {
-  delete json.$schema
-  let content = JSON.stringify(json)
-
-  if (typeof process === 'undefined' || 'env' in process === false) {
-    throw new Error('Process process.env not available')
-  }
-
-  content = content.replace(/\$\{(.*?)\}/g, (_, variable) => {
-    let varName = variable
-    let defaultValue = ''
-
-    if (variable.includes(':')) {
-      const spl = variable.split(':')
-      varName = spl.shift()
-      defaultValue = spl.join(':')
-    }
-
-    if (!process.env[varName]) {
-      throw new Error(`Env variable ${varName} not defined`)
-    }
-
-    return process.env[varName] || defaultValue
-  })
-
-  return JSON.parse(content)
-}
-
-export async function createHandler(meshInstance: MeshInstance, path: string) {
+export async function createApolloHandlerForMesh(meshInstance: MeshInstance, path: string) {
   const apolloServer = new ApolloServer({
-    context: meshInstance.contextBuilder,
+    context: ({ req }) => req,
     introspection: true,
     plugins: [
       ApolloServerPluginLandingPageGraphQLPlayground({
@@ -52,6 +27,29 @@ export async function createHandler(meshInstance: MeshInstance, path: string) {
   })
   await apolloServer.start()
 
+  const apolloHandler = apolloServer.createHandler({ path })
+
+  return apolloHandler
+}
+
+export async function getMesh(config: YamlConfig.Config): Promise<MeshInstance> {
+  const store = new MeshStore('.mesh', new InMemoryStoreStorageAdapter(), {
+    validate: true,
+    readonly: false,
+  })
+  return getGraphQLMesh(await processConfig(config, { dir: process.cwd(), store }))
+}
+
+export async function createServer(config: unknown, path: string) {
+  const meshConfig = config as YamlConfig.Config
+
+  const store = new MeshStore('.mesh', new InMemoryStoreStorageAdapter(), {
+    validate: true,
+    readonly: false,
+  })
+  const mesh = await getGraphQLMesh(await processConfig(meshConfig, { dir: process.cwd(), store }))
+  const apolloHandler = await createApolloHandlerForMesh(mesh, path)
+
   const corsHandler = cors({
     allowMethods: ['GET', 'POST', 'OPTIONS'],
     allowHeaders: [
@@ -66,16 +64,16 @@ export async function createHandler(meshInstance: MeshInstance, path: string) {
       'X-Api-Version',
       'Access-Control-Allow-Origin',
       'X-HTTP-Method-Override',
+      'x-apollo-tracing',
+      'apollographql-client-name',
+
+      // Magento 2 related headers
       'Authorization',
       'Store',
       'Preview-Version',
       'Content-Currency',
-      'X-Captcha',
-      'x-apollo-tracing',
-      'apollographql-client-name',
+      'X-ReCaptcha',
     ],
   })
-
-  const apolloHandler = apolloServer.createHandler({ path })
   return corsHandler((req, res) => (req.method === 'OPTIONS' ? res.end() : apolloHandler(req, res)))
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphcommerce/graphql-mesh",
-  "version": "3.0.8",
+  "version": "3.1.0",
   "author": "",
   "license": "MIT",
   "scripts": {
@@ -9,15 +9,17 @@
     "start": "next start"
   },
   "dependencies": {
-    "@graphql-mesh/cli": "^0.42.0",
-    "@graphql-mesh/config": "^0.24.0",
-    "@graphql-mesh/graphql": "^0.18.17",
-    "@graphql-mesh/merger-stitching": "^0.13.0",
-    "@graphql-mesh/runtime": "^0.23.0",
-    "@graphql-mesh/transform-cache": "^0.9.19",
-    "@graphql-mesh/transform-federation": "^0.6.9",
-    "@graphql-mesh/transform-filter-schema": "^0.12.0",
-    "@graphql-mesh/types": "^0.52.0",
+    "@graphql-mesh/cache-inmemory-lru": "^0.5.24",
+    "@graphql-mesh/cli": "^0.42.3",
+    "@graphql-mesh/config": "^0.24.2",
+    "@graphql-mesh/graphql": "^0.18.18",
+    "@graphql-mesh/merger-stitching": "^0.13.1",
+    "@graphql-mesh/runtime": "^0.23.1",
+    "@graphql-mesh/store": "^0.1.18",
+    "@graphql-mesh/transform-cache": "^0.9.20",
+    "@graphql-mesh/transform-federation": "^0.6.10",
+    "@graphql-mesh/transform-filter-schema": "^0.12.1",
+    "@graphql-mesh/types": "^0.53.0",
     "apollo-server-core": "^3.4.0",
     "apollo-server-micro": "^3.4.0",
     "graphql": "^15.6.1",
@@ -27,7 +29,7 @@
   },
   "devDependencies": {
     "@graphcommerce/browserslist-config-pwa": "^3.0.2",
-    "@graphcommerce/eslint-config-pwa": "^3.0.7",
+    "@graphcommerce/eslint-config-pwa": "^3.0.8",
     "@graphcommerce/prettier-config-pwa": "^3.0.3",
     "@graphcommerce/typescript-config-pwa": "^3.1.1",
     "@playwright/test": "^1.15.2",
@@ -49,5 +51,5 @@
       "project": "./tsconfig.json"
     }
   },
-  "gitHead": "5e31b902147a68bfce513451e4e10d1c74d23823"
+  "gitHead": "491a0fc0ea281263fe5c133aaabc23ab671a7b3d"
 }