@graphcommerce/next-config 8.1.0-canary.44 → 8.1.0-canary.46

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## 8.1.0-canary.46
+
+### Minor Changes
+
+- [#2313](https://github.com/graphcommerce-org/graphcommerce/pull/2313) [`511e75c`](https://github.com/graphcommerce-org/graphcommerce/commit/511e75c3f8c077e617ed17e5042796e2411f312f) - Add the customerNote field to the shipping and customer address forms
+  ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+### Patch Changes
+
+- [#2314](https://github.com/graphcommerce-org/graphcommerce/pull/2314) [`ccd218c`](https://github.com/graphcommerce-org/graphcommerce/commit/ccd218c827d8ba7e632fa40ed75ad63a38620275) - Solve an issue where interceptors were immediately deleted after generating
+  ([@paales](https://github.com/paales))
+
+## 8.1.0-canary.45
+
 ## 8.1.0-canary.44
 
 ## 8.1.0-canary.43

package/__tests__/config/utils/__snapshots__/mergeEnvIntoConfig.ts.snap

@@ -37,6 +37,7 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_CONFIGURABLE_VARIANT_VALUES_URL",
   "GC_CROSS_SELLS_HIDE_CART_ITEMS",
   "GC_CROSS_SELLS_REDIRECT_ITEMS",
+  "GC_CUSTOMER_ADDRESS_NOTE_ENABLE",
   "GC_CUSTOMER_COMPANY_FIELDS_ENABLE",
   "GC_CUSTOMER_DELETE_ENABLED",
   "GC_DATA_LAYER",

package/__tests__/interceptors/findPlugins.ts

@@ -211,6 +211,22 @@ it('finds plugins', () => {
         "targetModule": "@graphcommerce/graphql",
         "type": "component",
       },
+      {
+        "enabled": true,
+        "sourceExport": "getInContextInput",
+        "sourceModule": "@graphcommerce/magento-customer/plugins/magentoCustomerGetInContext",
+        "targetExport": "getInContextInput",
+        "targetModule": "@graphcommerce/graphql",
+        "type": "function",
+      },
+      {
+        "enabled": true,
+        "sourceExport": "useInContextInput",
+        "sourceModule": "@graphcommerce/magento-customer/plugins/magentoCustomerGetInContext",
+        "targetExport": "useInContextInput",
+        "targetModule": "@graphcommerce/graphql",
+        "type": "function",
+      },
       {
         "enabled": true,
         "sourceExport": "GraphQLProvider",
@@ -386,15 +402,6 @@ it('finds plugins', () => {
         "targetModule": "@graphcommerce/magento-recently-viewed-products",
         "type": "component",
       },
-      {
-        "enabled": false,
-        "ifConfig": "demoMode",
-        "sourceExport": "Plugin",
-        "sourceModule": "@graphcommerce/demo-magento-graphcommerce/plugins/demo/DemoProductListItemsBase",
-        "targetExport": "ProductListItemsBase",
-        "targetModule": "@graphcommerce/magento-product",
-        "type": "component",
-      },
       {
         "enabled": false,
         "ifConfig": "demoMode",
@@ -404,15 +411,6 @@ it('finds plugins', () => {
         "targetModule": "@graphcommerce/magento-product-configurable",
         "type": "component",
       },
-      {
-        "enabled": false,
-        "ifConfig": "demoMode",
-        "sourceExport": "Plugin",
-        "sourceModule": "@graphcommerce/demo-magento-graphcommerce/plugins/demo/DemoProductListItem",
-        "targetExport": "ProductListItem",
-        "targetModule": "@graphcommerce/magento-product",
-        "type": "component",
-      },
       {
         "enabled": false,
         "ifConfig": "previewSecret",

package/dist/generated/config.js

@@ -27,6 +27,7 @@ function GraphCommerceConfigSchema() {
         configurableVariantValues: MagentoConfigurableVariantValuesSchema().nullish(),
         crossSellsHideCartItems: zod_1.z.boolean().default(false).nullish(),
         crossSellsRedirectItems: zod_1.z.boolean().default(false).nullish(),
+        customerAddressNoteEnable: zod_1.z.boolean().nullish(),
         customerCompanyFieldsEnable: zod_1.z.boolean().nullish(),
         customerDeleteEnabled: zod_1.z.boolean().nullish(),
         dataLayer: DatalayerConfigSchema().nullish(),

package/dist/interceptors/writeInterceptors.js

@@ -17,19 +17,19 @@ function checkFileExists(file) {
 }
 async function writeInterceptors(interceptors, cwd = process.cwd()) {
     const dependencies = (0, resolveDependenciesSync_1.resolveDependenciesSync)(cwd);
-    const existing = [];
+    const existing = new Set();
     dependencies.forEach((dependency) => {
         const files = (0, glob_1.sync)([`${dependency}/**/*.interceptor.tsx`, `${dependency}/**/*.interceptor.ts`], { cwd });
-        existing.push(...files);
+        files.forEach((file) => existing.add(file));
     });
     const written = Object.entries(interceptors).map(async ([, plugin]) => {
         const extension = plugin.sourcePath.endsWith('.tsx') ? '.tsx' : '.ts';
         const relativeFile = `${plugin.fromRoot}.interceptor${extension}`;
-        if (existing.includes(relativeFile)) {
-            delete existing[existing.indexOf(relativeFile)];
+        if (existing.has(relativeFile)) {
+            existing.delete(relativeFile);
         }
-        if (existing.includes(`./${relativeFile}`)) {
-            delete existing[existing.indexOf(`./${relativeFile}`)];
+        if (existing.has(`./${relativeFile}`)) {
+            existing.delete(`./${relativeFile}`);
         }
         const fileToWrite = path_1.default.join(cwd, relativeFile);
         const isSame = (await checkFileExists(fileToWrite)) &&
@@ -38,7 +38,7 @@ async function writeInterceptors(interceptors, cwd = process.cwd()) {
             await promises_1.default.writeFile(fileToWrite, plugin.template);
     });
     // Cleanup unused interceptors
-    const cleaned = existing.map(async (file) => (await checkFileExists(file)) && (await promises_1.default.unlink(file)));
+    const cleaned = [...existing].map(async (file) => (await checkFileExists(file)) && (await promises_1.default.unlink(file)));
     await Promise.all(written);
     await Promise.all(cleaned);
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-config",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.1.0-canary.44",
+  "version": "8.1.0-canary.46",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "src/index.ts",

package/src/generated/config.ts

@@ -159,6 +159,8 @@ export type GraphCommerceConfig = {
    * Default: 'false'
    */
   crossSellsRedirectItems?: InputMaybe<Scalars['Boolean']['input']>;
+  /** Enables the shipping notes field in the checkout */
+  customerAddressNoteEnable?: InputMaybe<Scalars['Boolean']['input']>;
   /**
    * Enables company fields inside the checkout:
    * - Company name
@@ -493,6 +495,7 @@ export function GraphCommerceConfigSchema(): z.ZodObject<Properties<GraphCommerc
     configurableVariantValues: MagentoConfigurableVariantValuesSchema().nullish(),
     crossSellsHideCartItems: z.boolean().default(false).nullish(),
     crossSellsRedirectItems: z.boolean().default(false).nullish(),
+    customerAddressNoteEnable: z.boolean().nullish(),
     customerCompanyFieldsEnable: z.boolean().nullish(),
     customerDeleteEnabled: z.boolean().nullish(),
     dataLayer: DatalayerConfigSchema().nullish(),

package/src/interceptors/writeInterceptors.ts

@@ -17,24 +17,24 @@ export async function writeInterceptors(
   cwd: string = process.cwd(),
 ) {
   const dependencies = resolveDependenciesSync(cwd)
-  const existing: string[] = []
+  const existing = new Set<string>()
   dependencies.forEach((dependency) => {
     const files = globSync(
       [`${dependency}/**/*.interceptor.tsx`, `${dependency}/**/*.interceptor.ts`],
       { cwd },
     )
-    existing.push(...files)
+    files.forEach((file) => existing.add(file))
   })
 
   const written = Object.entries(interceptors).map(async ([, plugin]) => {
     const extension = plugin.sourcePath.endsWith('.tsx') ? '.tsx' : '.ts'
     const relativeFile = `${plugin.fromRoot}.interceptor${extension}`
 
-    if (existing.includes(relativeFile)) {
-      delete existing[existing.indexOf(relativeFile)]
+    if (existing.has(relativeFile)) {
+      existing.delete(relativeFile)
     }
-    if (existing.includes(`./${relativeFile}`)) {
-      delete existing[existing.indexOf(`./${relativeFile}`)]
+    if (existing.has(`./${relativeFile}`)) {
+      existing.delete(`./${relativeFile}`)
     }
 
     const fileToWrite = path.join(cwd, relativeFile)
@@ -47,7 +47,7 @@ export async function writeInterceptors(
   })
 
   // Cleanup unused interceptors
-  const cleaned = existing.map(
+  const cleaned = [...existing].map(
     async (file) => (await checkFileExists(file)) && (await fs.unlink(file)),
   )