@graphcommerce/graphql-mesh 3.0.10 → 3.2.1

package/CHANGELOG.md

@@ -3,6 +3,45 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.2.0](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/graphql-mesh@3.1.0...@graphcommerce/graphql-mesh@3.2.0) (2021-10-21)
+
+
+### Bug Fixes
+
+* **graphql-mesh:** use a build mesh for production environments ([cd2f318](https://github.com/ho-nl/m2-pwa/commit/cd2f3189383fa9d304bd367334e3f47ca4aa6100))
+* unable to find cache matching inmemoryLru ([520f6f3](https://github.com/ho-nl/m2-pwa/commit/520f6f329573471ecfdbdc4aa6f2e4b688b31f11))
+
+
+### Features
+
+* **graphql-mesh:** remove the api project and use a single project 🎉👩‍👩‍👦‍👦 ([ea4ad03](https://github.com/ho-nl/m2-pwa/commit/ea4ad0397d4ff289ef3b3253593fb0914c8c5246))
+
+
+
+
+
+# [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)
 
 

package/{createHandler.ts → createServer.ts}

@@ -1,4 +1,5 @@
-import { MeshInstance } from '@graphql-mesh/runtime'
+import { processConfig } from '@graphql-mesh/config'
+import { getMesh as getGraphQLMesh, MeshInstance } from '@graphql-mesh/runtime'
 import { YamlConfig } from '@graphql-mesh/types'
 import { ApolloServerPluginLandingPageGraphQLPlayground } from 'apollo-server-core'
 import { ApolloServer } from 'apollo-server-micro'
@@ -7,39 +8,17 @@ import '@graphql-mesh/graphql'
 import '@graphql-mesh/merger-stitching'
 import '@graphql-mesh/transform-cache'
 import '@graphql-mesh/cache-inmemory-lru'
+import '@vue/compiler-sfc'
 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 getMesh(config: unknown): Promise<MeshInstance> {
+  return getGraphQLMesh(await processConfig(config as YamlConfig.Config, { dir: process.cwd() }))
 }
 
-export async function createHandler(meshInstance: MeshInstance, path: string) {
+export async function createServer(mesh: Promise<MeshInstance>, path: string) {
+  const meshInstance = await mesh
   const apolloServer = new ApolloServer({
     context: ({ req }) => req,
     introspection: true,
@@ -53,6 +32,8 @@ export async function createHandler(meshInstance: MeshInstance, path: string) {
   })
   await apolloServer.start()
 
+  const apolloHandler = apolloServer.createHandler({ path })
+
   const corsHandler = cors({
     allowMethods: ['GET', 'POST', 'OPTIONS'],
     allowHeaders: [
@@ -67,16 +48,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/index.ts

@@ -1,4 +1,3 @@
-export * from './createHandler'
-export * from './createTabs'
+export * from './createServer'
 
 export const config = { api: { bodyParser: false } }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphcommerce/graphql-mesh",
-  "version": "3.0.10",
+  "version": "3.2.1",
   "author": "",
   "license": "MIT",
   "scripts": {
@@ -9,26 +9,33 @@
     "start": "next start"
   },
   "dependencies": {
-    "@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/transform-cache": "^0.9.20",
-    "@graphql-mesh/transform-federation": "^0.6.10",
-    "@graphql-mesh/transform-filter-schema": "^0.12.1",
+    "@graphql-mesh/cache-inmemory-lru": "^0.5.25",
+    "@graphql-mesh/cli": "^0.42.6",
+    "@graphql-mesh/config": "^0.24.4",
+    "@graphql-mesh/graphql": "^0.18.19",
+    "@graphql-mesh/merger-stitching": "^0.13.2",
+    "@graphql-mesh/runtime": "^0.24.1",
+    "@graphql-mesh/store": "^0.1.19",
+    "@graphql-mesh/transform-cache": "^0.9.21",
+    "@graphql-mesh/transform-federation": "^0.6.11",
+    "@graphql-mesh/transform-filter-schema": "^0.12.2",
     "@graphql-mesh/types": "^0.53.0",
+    "@graphql-mesh/utils": "^0.19.0",
+    "@graphql-tools/utils": "^8.5.0",
+    "@vue/compiler-sfc": "^3.2.20",
     "apollo-server-core": "^3.4.0",
     "apollo-server-micro": "^3.4.0",
+    "camel-case": "^4.1.2",
+    "fetchache": "^0.1.1",
     "graphql": "^15.6.1",
     "micro": "^9.3.4",
     "micro-cors": "^0.1.1",
+    "pascal-case": "^3.1.2",
     "ts-tiny-invariant": "^0.0.3"
   },
   "devDependencies": {
     "@graphcommerce/browserslist-config-pwa": "^3.0.2",
-    "@graphcommerce/eslint-config-pwa": "^3.0.8",
+    "@graphcommerce/eslint-config-pwa": "^3.1.1",
     "@graphcommerce/prettier-config-pwa": "^3.0.3",
     "@graphcommerce/typescript-config-pwa": "^3.1.1",
     "@playwright/test": "^1.15.2",
@@ -50,5 +57,5 @@
       "project": "./tsconfig.json"
     }
   },
-  "gitHead": "99b31bb867bc0a28b1687fe2c7a67f67f0b1e8e3"
+  "gitHead": "a71eb508e3ddf42e5705e23bc8016f6f08969c74"
 }

package/createTabs.ts

@@ -1,12 +0,0 @@
-import { DocumentNode, print } from 'graphql'
-
-export function createTabs(queries: DocumentNode[], endpoint: string) {
-  return Object.entries(queries)
-    .filter(([name]) => name.endsWith('Document'))
-    .map(([name, gql]) => ({
-      name: name.replace('Document', ''),
-      query: print(gql),
-      endpoint,
-    }))
-    .filter(({ query }) => query.includes('@client') === false)
-}