@faststore/core 2.2.33 → 2.2.35

package/.turbo/turbo-build.log

@@ -26,8 +26,8 @@ info  - Generating static pages (1/7)
 warn - AlertSectionIcon not found. Add a new component for this section or remove it from the CMS
 info  - Generating static pages (3/7)
 warn - AlertSectionIcon not found. Add a new component for this section or remove it from the CMS
-info  - Generating static pages (5/7)
 warn - AlertSectionIcon not found. Add a new component for this section or remove it from the CMS
+info  - Generating static pages (5/7)
 warn - AlertSectionIcon not found. Add a new component for this section or remove it from the CMS
 info  - Generating static pages (7/7)
 info  - Finalizing page optimization...

package/.turbo/turbo-test.log

@@ -1,25 +1,25 @@
 $ tsdx test
 ts-jest[versions] (WARN) Version 29.1.0 of jest installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=25.0.0 <26.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
 ts-jest[versions] (WARN) Version 4.9.4 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=3.4.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
-PASS test/server/index.test.ts (13.202s)
+PASS test/server/index.test.ts (5.867s)
   FastStore GraphQL Layer
     @faststore/api
       ✓ should return a valid GraphQL schema (5ms)
-      ✓ should return a valid GraphQL schema contain all expected types (8ms)
+      ✓ should return a valid GraphQL schema contain all expected types (4ms)
       ✓ should return a valid GraphQL schema contain all expected queries (1ms)
-      ✓ should return a valid GraphQL schema contain all expected mutations (1ms)
+      ✓ should return a valid GraphQL schema contain all expected mutations
     VTEX API Extension
       ✓ getTypeDefsFromFolder function should return an Array (6ms)
     Third Party API Extension
       ✓ getTypeDefsFromFolder function should return an Array (5ms)
     Final Schema after merging
-      ✓ should return a valid merged GraphQL schema (26ms)
+      ✓ should return a valid merged GraphQL schema (25ms)
     Envelop
-      ✓ should exist with its plugins (24ms)
-      ✓ should handle options and execute (506ms)
+      ✓ should exist with its plugins (28ms)
+      ✓ should handle options and execute (152ms)
 
 Test Suites: 1 passed, 1 total
 Tests:       9 passed, 9 total
 Snapshots:   0 total
-Time:        13.901s
+Time:        6.297s
 Ran all test suites.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "2.2.33",
+  "version": "2.2.35",
   "license": "MIT",
   "browserslist": "supports es6-module and not dead",
   "exports": {
@@ -36,10 +36,10 @@
     "@envelop/graphql-jit": "^1.1.1",
     "@envelop/parser-cache": "^2.2.0",
     "@envelop/validation-cache": "^2.2.0",
-    "@faststore/api": "^2.2.33",
+    "@faststore/api": "^2.2.35",
     "@faststore/components": "^2.2.33",
     "@faststore/graphql-utils": "^2.2.33",
-    "@faststore/sdk": "^2.2.33",
+    "@faststore/sdk": "^2.2.35",
     "@faststore/ui": "^2.2.33",
     "@graphql-codegen/cli": "^3.3.1",
     "@graphql-codegen/typescript": "^3.0.4",
@@ -118,5 +118,5 @@
   "msw": {
     "workerDirectory": "public"
   },
-  "gitHead": "3ef3bacdc55e2a9719398e5920a564b231a86bc5"
+  "gitHead": "dbb59ea5a444b7b542481b6842ab8bc230ed9a94"
 }

package/src/components/ThirdPartyScripts/GoogleTagManager.tsx

@@ -3,7 +3,7 @@ interface Props {
   dataLayerName?: string
 }
 
-const GTM_DEBUG_QUERY_STRING = 'gtm_debug'
+export const GTM_DEBUG_QUERY_STRING = 'gtm_debug'
 
 const useSnippet = (opts: Props & { partytownScript: boolean }) => `${
   opts.partytownScript ? '!' : ''

package/src/components/ThirdPartyScripts/ThirdPartyScripts.tsx

@@ -1,11 +1,9 @@
 import { Partytown } from '@builder.io/partytown/react'
 import OverrideComponents from 'src/customizations/src/GlobalOverrides'
 import storeConfig from '../../../faststore.config'
-import GoogleTagManager from './GoogleTagManager'
+import GoogleTagManager, { GTM_DEBUG_QUERY_STRING } from './GoogleTagManager'
 import VTEX from './vtex'
 
-const isString = (obj: unknown): obj is string => typeof obj === 'string'
-
 const gtmContainerId = storeConfig.analytics?.gtmContainerId
 
 const includeGTM = typeof gtmContainerId === 'string'
@@ -20,18 +18,26 @@ if (process.env.NODE_ENV === 'development' && !includeGTM) {
 function ThirdPartyScripts() {
   const forwards = []
   if (includeVTEX) forwards.push('sendrc', 'vtexaf')
-  if (includeGTM) forwards.push('dataLayer.push')
 
   return (
     <>
+      {/* We're setting the partytown config (forward property) dynamically based on the gtm_debug query string
+       * This helps users see the GTM events properly when using GTM preview. All it does is NOT forward dataLayer.push
+       * calls to partytown when the gtm_debug query string is present.
+       *
+       * This is not done in the component because the window var is not available yet.
+       */}
+      <script
+        dangerouslySetInnerHTML={{
+          __html: `var partytown={forward:[...${JSON.stringify(
+            forwards
+          )},!window.location.search.includes('${GTM_DEBUG_QUERY_STRING}=')&&${includeGTM}?'dataLayer.push':null].filter(Boolean)}`,
+        }}
+      />
       {includeGTM && <GoogleTagManager containerId={gtmContainerId} />}
       {includeVTEX && <VTEX />}
       <OverrideComponents.ThirdPartyScripts />
-      <Partytown
-        key="partytown"
-        // Variables to forward to from main to worker
-        forward={forwards}
-      />
+      <Partytown key="partytown" />
     </>
   )
 }