@faststore/core 3.0.122 → 3.0.124

package/.turbo/turbo-build.log

@@ -33,27 +33,7 @@ https://nextjs.org/telemetry
    Creating an optimized production build ...
    Disabled SWC as replacement for Babel because of custom Babel configuration ".babelrc.js" https://nextjs.org/docs/messages/swc-disabled
    Using external babel configuration from /home/runner/work/faststore/faststore/packages/core/.babelrc.js
- ⚠ Compiled with warnings
-
-./discovery.config.js
-Module not found: Can't resolve './src/customizations/faststore.config' in '/home/runner/work/faststore/faststore/packages/core'
-
-Import trace for requested module:
-./discovery.config.js
-
-./discovery.config.js
-Module not found: Can't resolve './src/customizations/faststore.config' in '/home/runner/work/faststore/faststore/packages/core'
-
-Import trace for requested module:
-./discovery.config.js
-
-./discovery.config.js
-Module not found: Can't resolve './src/customizations/faststore.config' in '/home/runner/work/faststore/faststore/packages/core'
-
-Import trace for requested module:
-./discovery.config.js
-./src/pages/api/preview.ts
-
+ ✓ Compiled successfully
    Collecting page data ...
    Generating static pages (0/7) ...
 
   Generating static pages (1/7) 
@@ -67,7 +47,7 @@ Warning: Dynamic Content not found for the page: home. Refer to the Dynamic Cont
 Route (pages)                              Size     First Load JS
 ┌ ● /                                      1.24 kB         143 kB
 ├   └ css/197e314c5a03eabd.css             740 B
-├   /_app                                  0 B            90.8 kB
+├   /_app                                  0 B            90.7 kB
 ├ ● /[...slug]                             2.79 kB         155 kB
 ├   └ css/e47f1a002bdcf76f.css             2.38 kB
 ├ ● /[slug]/p                              10.8 kB         152 kB
@@ -75,17 +55,17 @@ Route (pages)                              Size     First Load JS
 ├ ○ /404                                   1.28 kB         126 kB
 ├ ● /500                                   1.29 kB         126 kB
 ├ ● /account                               676 B           126 kB
-├ λ /api/graphql                           0 B            90.8 kB
-├ λ /api/health/live                       0 B            90.8 kB
-├ λ /api/health/ready                      0 B            90.8 kB
-├ λ /api/preview                           0 B            90.8 kB
+├ λ /api/graphql                           0 B            90.7 kB
+├ λ /api/health/live                       0 B            90.7 kB
+├ λ /api/health/ready                      0 B            90.7 kB
+├ λ /api/preview                           0 B            90.7 kB
 ├ ● /checkout                              661 B           126 kB
-├ ● /login                                 1.4 kB          127 kB
+├ ● /login                                 1.4 kB          126 kB
 └ ● /s                                     2.22 kB         154 kB
 + First Load JS shared by all              93.8 kB
   ├ chunks/framework-8e279965036b6169.js   45.4 kB
   ├ chunks/main-029f1328cfee9686.js        33.1 kB
-  ├ chunks/pages/_app-1137bddee8be825f.js  9.96 kB
+  ├ chunks/pages/_app-68b16ab75cae8271.js  9.87 kB
   ├ chunks/webpack-5b0bd69e10af14e4.js     2.38 kB
   └ css/ee0556daedda6306.css               3.07 kB
 

package/.turbo/turbo-test.log

@@ -1,10 +1,10 @@
 $ jest
-PASS test/utils/multipleTemplates.test.ts (35.629 s)
-PASS test/server/cms/index.test.ts (35.787 s)
-PASS test/server/index.test.ts (38.964 s)
+PASS test/server/cms/index.test.ts (35.355 s)
+PASS test/utils/multipleTemplates.test.ts (36.11 s)
+PASS test/server/index.test.ts (40.2 s)
 
 Test Suites: 3 passed, 3 total
 Tests:       19 passed, 19 total
 Snapshots:   0 total
-Time:        40.012 s
+Time:        41.139 s
 Ran all test suites.

package/discovery.config.js

@@ -1,20 +1,7 @@
 const defaultConfig = require('./discovery.config.default')
-const deepmerge = require('deepmerge')
-
-let starterConfig
+const starterConfig = require('./src/customizations/discovery.config')
 
-try {
-  starterConfig = require('./src/customizations/discovery.config')
-} catch (e) {
-  try {
-    starterConfig = require('./src/customizations/faststore.config')
-  } catch (e) {
-    console.error(
-      "Failed to load './src/customizations/faststore.config'. Please ensure the file exists."
-    )
-    throw e // Re-throw the error after logging
-  }
-}
+const deepmerge = require('deepmerge')
 
 /**
  * @type {typeof defaultConfig & Record<string, any>}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.0.122",
+  "version": "3.0.124",
   "license": "MIT",
   "repository": "vtex/faststore",
   "browserslist": "supports es6-module and not dead",
@@ -39,11 +39,11 @@
   "dependencies": {
     "@antfu/ni": "^0.21.12",
     "@builder.io/partytown": "^0.6.1",
-    "@envelop/core": "^1.2.0",
-    "@envelop/graphql-jit": "^1.1.1",
-    "@envelop/parser-cache": "^2.2.0",
-    "@envelop/validation-cache": "^2.2.0",
-    "@faststore/api": "^3.0.122",
+    "@envelop/core": "^3.0.0",
+    "@envelop/graphql-jit": "^3.0.0",
+    "@envelop/parser-cache": "^3.0.0",
+    "@envelop/validation-cache": "^3.0.0",
+    "@faststore/api": "^3.0.124",
     "@faststore/components": "^3.0.116",
     "@faststore/graphql-utils": "^3.0.116",
     "@faststore/lighthouse": "^3.0.116",
@@ -128,5 +128,5 @@
     "node": "18.19.0",
     "yarn": "1.19.1"
   },
-  "gitHead": "e1b59dbac520b276dd759e7a78100ab94edfcbb8"
+  "gitHead": "0d1c7d8b773cdf7c0583df30ab7d070f1cd17f85"
 }

package/src/server/index.ts

@@ -1,11 +1,11 @@
 /* eslint-disable react-hooks/rules-of-hooks */
-import path from 'path'
-import type { FormatErrorHandler } from '@envelop/core'
 import {
   envelop,
-  useSchema,
+  MaskError,
+  useEngine,
   useExtendContext,
   useMaskedErrors,
+  useSchema,
 } from '@envelop/core'
 import { useGraphQlJit } from '@envelop/graphql-jit'
 import { useParserCache } from '@envelop/parser-cache'
@@ -16,18 +16,20 @@ import {
   getResolvers,
   isFastStoreError,
 } from '@faststore/api'
-import { GraphQLError } from 'graphql'
-import { makeExecutableSchema } from '@graphql-tools/schema'
 import { loadFilesSync } from '@graphql-tools/load-files'
+import { makeExecutableSchema } from '@graphql-tools/schema'
 import type { TypeSource } from '@graphql-tools/utils'
+import * as GraphQLJS from 'graphql'
+import { GraphQLError } from 'graphql'
+import path from 'path'
 
 import persisted from '@generated/persisted-documents.json'
 
-import vtexExtensionsResolvers from '../customizations/src/graphql/vtex/resolvers'
 import thirdPartyResolvers from '../customizations/src/graphql/thirdParty/resolvers'
+import vtexExtensionsResolvers from '../customizations/src/graphql/vtex/resolvers'
 
-import { apiOptions } from './options'
 import { Operation } from '../sdk/graphql/request'
+import { apiOptions } from './options'
 
 interface ExecuteOptions<V = Record<string, unknown>> {
   operation: Operation
@@ -39,7 +41,7 @@ const persistedQueries = new Map(Object.entries(persisted))
 
 const apiContextFactory = getContextFactory(apiOptions)
 
-const formatError: FormatErrorHandler = (err) => {
+const customFormatError: MaskError = (err) => {
   if (err instanceof GraphQLError && isFastStoreError(err.originalError)) {
     return err
   }
@@ -68,9 +70,10 @@ function getFinalAPISchema() {
 export const getEnvelop = async () =>
   envelop({
     plugins: [
+      useEngine(GraphQLJS),
       useSchema(getFinalAPISchema()),
       useExtendContext(apiContextFactory),
-      useMaskedErrors({ formatError }),
+      useMaskedErrors({ maskError: customFormatError }),
       useGraphQlJit(),
       useValidationCache(),
       useParserCache(),

package/test/server/index.test.ts

@@ -132,7 +132,7 @@ describe('FastStore GraphQL Layer', () => {
     it('should exist with its plugins', async () => {
       const envelop = await getEnvelop()
       expect(envelop).toBeDefined()
-      expect(envelop._plugins).toHaveLength(6)
+      expect(envelop._plugins).toHaveLength(7)
     })
 
     it('should handle options and execute', async () => {