@graphcommerce/next-config 10.0.4-canary.1 → 10.1.0-canary.13

package/CHANGELOG.md

@@ -1,5 +1,41 @@
 # Change Log
 
+## 10.1.0-canary.13
+
+### Patch Changes
+
+- [#2621](https://github.com/graphcommerce-org/graphcommerce/pull/2621) [`4eccccd`](https://github.com/graphcommerce-org/graphcommerce/commit/4eccccdad9418e713cb6959b20e9cde6ab26d9ae) - `graphcommerce cleanup-interceptors` now actually finds and restores `.original.tsx` / `.original.ts` files when run from a consumer project. Previously `findDotOriginalFiles` walked up looking for a `@graphcommerce/*` parent package; from a consumer project (where there is no such parent) `parentPath` ended up `null` and the glob expanded to literally `null/**/*.original.tsx`, so the command silently restored nothing. Now it falls back to `cwd` and `cwd/node_modules/@graphcommerce` where interceptors actually live for consumers.
+
+  Also fixes a display bug — the final `X files restored from .original` line printed an always-`0` counter (`restoredCount` was declared but never incremented; the now-removed `removedCount` was the one being incremented). Counter and message are now consistent. ([@paales](https://github.com/paales))
+
+## 10.1.0-canary.12
+
+## 10.1.0-canary.11
+
+### Patch Changes
+
+- [#2621](https://github.com/graphcommerce-org/graphcommerce/pull/2621) [`4eccccd`](https://github.com/graphcommerce-org/graphcommerce/commit/4eccccdad9418e713cb6959b20e9cde6ab26d9ae) - `graphcommerce cleanup-interceptors` now actually finds and restores `.original.tsx` / `.original.ts` files when run from a consumer project. Previously `findDotOriginalFiles` walked up looking for a `@graphcommerce/*` parent package; from a consumer project (where there is no such parent) `parentPath` ended up `null` and the glob expanded to literally `null/**/*.original.tsx`, so the command silently restored nothing. Now it falls back to `cwd` and `cwd/node_modules/@graphcommerce` where interceptors actually live for consumers.
+
+  Also fixes a display bug — the final `X files restored from .original` line printed an always-`0` counter (`restoredCount` was declared but never incremented; the now-removed `removedCount` was the one being incremented). Counter and message are now consistent. ([@paales](https://github.com/paales))
+
+## 10.1.0-canary.10
+
+## 10.1.0-canary.9
+
+## 10.1.0-canary.8
+
+## 10.1.0-canary.7
+
+## 10.1.0-canary.6
+
+## 10.1.0-canary.5
+
+## 10.1.0-canary.4
+
+## 10.1.0-canary.3
+
+## 10.0.4-canary.2
+
 ## 10.0.4-canary.1
 
 ## 10.0.4-canary.0

package/__tests__/interceptors/generateInterceptors.ts

@@ -75,7 +75,8 @@ it('it generates an interceptor', async () => {
     type PluginAddMollieMethodsProps = OmitPrev<
       React.ComponentProps<typeof PluginAddMollieMethods>,
       'Prev'
-    >
+    > &
+      PluginAddBraintreeMethodsProps
 
     const PluginAddMollieMethodsInterceptor = (props: PluginAddMollieMethodsProps) => (
       <PluginAddMollieMethods {...props} Prev={PluginAddBraintreeMethodsInterceptor} />
@@ -91,7 +92,9 @@ it('it generates an interceptor', async () => {
      * @see {PluginAddBraintreeMethods} for source of applied plugin
      * @see {PluginAddMollieMethods} for source of applied plugin
      */
-    export const PaymentMethodContextProvider = PluginAddMollieMethodsInterceptor
+    export const PaymentMethodContextProvider =
+      PluginAddMollieMethodsInterceptor as typeof PaymentMethodContextProviderOriginal &
+        React.FC<PluginAddMollieMethodsProps>
     "
   `)
 })
@@ -176,7 +179,8 @@ it('it can apply multiple plugins to a single export', async () => {
     type PluginAddMollieMethodsProps = OmitPrev<
       React.ComponentProps<typeof PluginAddMollieMethods>,
       'Prev'
-    >
+    > &
+      PluginAddAdyenMethodsProps
 
     const PluginAddMollieMethodsInterceptor = (props: PluginAddMollieMethodsProps) => (
       <PluginAddMollieMethods {...props} Prev={PluginAddAdyenMethodsInterceptor} />
@@ -192,7 +196,9 @@ it('it can apply multiple plugins to a single export', async () => {
      * @see {PluginAddAdyenMethods} for source of applied plugin
      * @see {PluginAddMollieMethods} for source of applied plugin
      */
-    export const PaymentMethodContextProvider = PluginAddMollieMethodsInterceptor
+    export const PaymentMethodContextProvider =
+      PluginAddMollieMethodsInterceptor as typeof PaymentMethodContextProviderOriginal &
+        React.FC<PluginAddMollieMethodsProps>
     "
   `)
 })
@@ -245,7 +251,8 @@ it('it handles on duplicates gracefully', async () => {
     type PluginAddBraintreeMethodsProps = OmitPrev<
       React.ComponentProps<typeof PluginAddBraintreeMethods>,
       'Prev'
-    >
+    > &
+      PluginAddBraintreeMethodsProps
 
     const PluginAddBraintreeMethodsInterceptor = (props: PluginAddBraintreeMethodsProps) => (
       <PluginAddBraintreeMethods {...props} Prev={PluginAddBraintreeMethodsInterceptor} />
@@ -261,7 +268,9 @@ it('it handles on duplicates gracefully', async () => {
      * @see {PluginAddBraintreeMethods} for source of applied plugin
      * @see {PluginAddBraintreeMethods} for source of applied plugin
      */
-    export const PaymentMethodContextProvider = PluginAddBraintreeMethodsInterceptor
+    export const PaymentMethodContextProvider =
+      PluginAddBraintreeMethodsInterceptor as typeof PaymentMethodContextProviderOriginal &
+        React.FC<PluginAddBraintreeMethodsProps>
     "
   `)
 })
@@ -636,7 +645,9 @@ export const Plugin = ConfigurableProductPageName
      * @see {ProductPageNameMyPlugin} for source of replaced component
      * @see {PluginConfigurableProductPageName} for source of applied plugin
      */
-    export const ProductPageName = PluginConfigurableProductPageNameInterceptor
+    export const ProductPageName =
+      PluginConfigurableProductPageNameInterceptor as typeof ProductPageNameMyPlugin &
+        React.FC<PluginConfigurableProductPageNameProps>
     "
   `)
 })

package/dist/index.js

@@ -52,9 +52,12 @@ async function findDotOriginalFiles(cwd) {
     if (p) parentPath = p;
     else break;
   }
-  return Promise.all(
-    (await glob([`${parentPath}/**/*.original.tsx`, `${parentPath}/**/*.original.ts`], { cwd })).map((file) => fs.realpath(file))
-  );
+  const roots = parentPath ? [parentPath] : [cwd, `${cwd}/node_modules/@graphcommerce`];
+  const patterns = roots.flatMap((root) => [
+    `${root}/**/*.original.tsx`,
+    `${root}/**/*.original.ts`
+  ]);
+  return Promise.all((await glob(patterns, { cwd })).map((file) => fs.realpath(file)));
 }
 async function writeInterceptors(interceptors, cwd = process.cwd()) {
   const processedFiles = [];
@@ -105,13 +108,12 @@ dotenv.config({ quiet: true });
 async function cleanupInterceptors(cwd = process.cwd()) {
   console.info("\u{1F9F9} Starting interceptor cleanup...");
   let restoredCount = 0;
-  let removedCount = 0;
   const originalFiles = await findDotOriginalFiles(cwd);
   console.info(`\u{1F4C2} Found ${originalFiles.length} .original files to restore`);
   for (const originalFile of originalFiles) {
     try {
       await restoreOriginalFile(originalFile);
-      removedCount++;
+      restoredCount++;
     } catch (error) {
       console.error(`\u274C Failed to restore ${originalFile}:`, error);
     }
@@ -428,7 +430,7 @@ function extractValue(node, path, optional = false) {
   }
 }
 function extractExports(module) {
-  const exports$1 = {};
+  const exports = {};
   const errors = [];
   for (const moduleItem of module.body) {
     switch (moduleItem.type) {
@@ -442,19 +444,19 @@ function extractExports(module) {
         switch (moduleItem.declaration.type) {
           case "ClassDeclaration":
           case "FunctionDeclaration":
-            exports$1[moduleItem.declaration.identifier.value] = RUNTIME_VALUE;
+            exports[moduleItem.declaration.identifier.value] = RUNTIME_VALUE;
             break;
           case "VariableDeclaration":
             moduleItem.declaration.declarations.forEach((decl) => {
               if (isIdentifier(decl.id) && decl.init) {
-                exports$1[decl.id.value] = extractValue(decl.init, void 0, true);
+                exports[decl.id.value] = extractValue(decl.init, void 0, true);
               }
             });
             break;
         }
     }
   }
-  return [exports$1, errors];
+  return [exports, errors];
 }
 
 const pluginConfigParsed = z.object({
@@ -468,7 +470,7 @@ function nonNullable(value) {
 }
 const isObject = (input) => typeof input === "object" && input !== null && !Array.isArray(input);
 function parseStructure(ast, gcConfig, sourceModule) {
-  const [exports$1, errors] = extractExports(ast);
+  const [exports, errors] = extractExports(ast);
   if (errors.length) console.error("Plugin error for", errors.join("\n"));
   const {
     config: moduleConfig,
@@ -479,7 +481,7 @@ function parseStructure(ast, gcConfig, sourceModule) {
     plugin,
     Plugin,
     ...rest
-  } = exports$1;
+  } = exports;
   const exportVals = Object.keys(rest);
   if (component && !moduleConfig) exportVals.push("Plugin");
   if (func && !moduleConfig) exportVals.push("plugin");
@@ -513,7 +515,7 @@ function parseStructure(ast, gcConfig, sourceModule) {
       }
     }
     const val = {
-      targetExport: exports$1.component || exports$1.func || parsed.data.export,
+      targetExport: exports.component || exports.func || parsed.data.export,
       sourceModule,
       sourceExport: parsed.data.export,
       targetModule: parsed.data.module,
@@ -623,12 +625,12 @@ function parseAndFindExport(resolved, findExport, resolve) {
       }
     }
   }
-  const exports$1 = ast.body.filter((node) => node.type === "ExportAllDeclaration").sort((a, b) => {
+  const exports = ast.body.filter((node) => node.type === "ExportAllDeclaration").sort((a, b) => {
     const probablyA = a.source.value.includes(findExport);
     const probablyB = b.source.value.includes(findExport);
     return probablyA === probablyB ? 0 : probablyA ? -1 : 1;
   });
-  for (const node of exports$1) {
+  for (const node of exports) {
     const isRelative = node.source.value.startsWith(".");
     if (isRelative) {
       const d = resolved.dependency === resolved.denormalized ? resolved.dependency.substring(0, resolved.dependency.lastIndexOf("/")) : resolved.dependency;
@@ -1485,7 +1487,7 @@ async function createConfigSectionFile(sectionName, sectionValue, targetDir, tar
   for (const key of schemaKeys) {
     completeSectionValue[key] = sectionValue[key];
   }
-  const exports$1 = Object.entries(completeSectionValue).map(([key, value]) => {
+  const exports = Object.entries(completeSectionValue).map(([key, value]) => {
     const valueStr = generateValueLiteral(value);
     const propertyPath = `'${sectionName}.${key}'`;
     const typeAnnotation = `: Get<GraphCommerceConfig, ${propertyPath}>`;
@@ -1496,7 +1498,7 @@ import type { Get } from 'type-fest'` ;
   const content = `// Auto-generated by 'yarn graphcommerce codegen-config-values'
 ${imports}
 
-${exports$1}
+${exports}
 `;
   const formattedContent = await prettier.format(content, {
     ...prettierConf,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-config",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "10.0.4-canary.1",
+  "version": "10.1.0-canary.13",
   "type": "module",
   "exports": {
     ".": {
@@ -63,7 +63,7 @@
   },
   "peerDependencies": {
     "@apollo/client": "*",
-    "@graphcommerce/prettier-config-pwa": "^10.0.4-canary.1",
+    "@graphcommerce/prettier-config-pwa": "^10.1.0-canary.13",
     "@lingui/loader": "*",
     "@lingui/macro": "*",
     "@lingui/react": "*",

package/src/commands/cleanupInterceptors.ts

@@ -7,7 +7,6 @@ export async function cleanupInterceptors(cwd: string = process.cwd()) {
   console.info('🧹 Starting interceptor cleanup...')
 
   let restoredCount = 0
-  let removedCount = 0
 
   const originalFiles = await findDotOriginalFiles(cwd)
   console.info(`📂 Found ${originalFiles.length} .original files to restore`)
@@ -15,7 +14,7 @@ export async function cleanupInterceptors(cwd: string = process.cwd()) {
   for (const originalFile of originalFiles) {
     try {
       await restoreOriginalFile(originalFile)
-      removedCount++
+      restoredCount++
     } catch (error) {
       console.error(`❌ Failed to restore ${originalFile}:`, error)
     }

package/src/interceptors/writeInterceptors.ts

@@ -40,11 +40,18 @@ export async function findDotOriginalFiles(cwd: string) {
     else break
   }
 
-  return Promise.all(
-    (
-      await glob([`${parentPath}/**/*.original.tsx`, `${parentPath}/**/*.original.ts`], { cwd })
-    ).map((file) => fs.realpath(file)),
-  )
+  // Called from inside a @graphcommerce package (upstream dev) → scan from the
+  // outermost @graphcommerce parent. Called from a consumer project (no
+  // @graphcommerce parent) → scan the project AND node_modules/@graphcommerce,
+  // because the interceptor system writes .original files alongside the
+  // installed packages there.
+  const roots = parentPath ? [parentPath] : [cwd, `${cwd}/node_modules/@graphcommerce`]
+  const patterns = roots.flatMap((root) => [
+    `${root}/**/*.original.tsx`,
+    `${root}/**/*.original.ts`,
+  ])
+
+  return Promise.all((await glob(patterns, { cwd })).map((file) => fs.realpath(file)))
 }
 
 export async function writeInterceptors(