@graphcommerce/next-config 4.31.0-canary.1 → 4.31.0-canary.2

package/dist/interceptors/InterceptorPlugin.d.ts

@@ -1,6 +1,7 @@
 import { Compiler } from 'webpack';
 export declare class InterceptorPlugin {
     private interceptors;
+    private interceptorByDepependency;
     private resolveDependency;
     constructor();
     private watched;

package/dist/interceptors/InterceptorPlugin.js

@@ -15,6 +15,7 @@ class InterceptorPlugin {
         this.resolveDependency = (0, resolveDependency_1.resolveDependency)();
         this.watched = this.watchList();
         this.interceptors = (0, generateInterceptors_1.generateInterceptors)((0, findPlugins_1.findPlugins)(), this.resolveDependency);
+        this.interceptorByDepependency = Object.fromEntries(Object.values(this.interceptors).map((i) => [i.dependency, i]));
         (0, writeInterceptors_1.writeInterceptors)(this.interceptors);
     }
     watchList() {
@@ -40,6 +41,7 @@ class InterceptorPlugin {
             }
             if (added.length > 0 || removed.length > 0) {
                 this.interceptors = (0, generateInterceptors_1.generateInterceptors)((0, findPlugins_1.findPlugins)(), this.resolveDependency);
+                this.interceptorByDepependency = Object.fromEntries(Object.values(this.interceptors).map((i) => [i.dependency, i]));
                 (0, writeInterceptors_1.writeInterceptors)(this.interceptors);
             }
         });
@@ -51,8 +53,14 @@ class InterceptorPlugin {
                     logger.log(`Interceptor ${issuer} is requesting the original ${requestPath}`);
                     return;
                 }
-                if (this.interceptors[requestPath]) {
-                    logger.log(`Intercepting... ${this.interceptors[requestPath].fromRoot}}`);
+                const interceptorForRequest = this.interceptorByDepependency[resource.request];
+                if (interceptorForRequest) {
+                    logger.log(`Intercepting... ${interceptorForRequest.dependency}`);
+                    resource.request = `${interceptorForRequest.denormalized}.interceptor.tsx`;
+                }
+                const interceptorForPath = this.interceptors[requestPath];
+                if (interceptorForPath) {
+                    logger.log(`Intercepting... ${interceptorForPath.fromRoot}`);
                     resource.request = `${resource.request}.interceptor.tsx`;
                 }
             });

package/dist/utils/resolveDependency.d.ts

@@ -1,5 +1,6 @@
 export declare type ResolveDependencyReturn = {
     dependency: string;
+    denormalized: string;
     root: string;
     fromRoot: string;
     fromModule: string;

package/dist/utils/resolveDependency.js

@@ -1,18 +1,33 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveDependency = void 0;
+const node_fs_1 = __importDefault(require("node:fs"));
 const resolveDependenciesSync_1 = require("./resolveDependenciesSync");
 const resolveDependency = (cwd = process.cwd()) => {
     const dependencies = (0, resolveDependenciesSync_1.resolveDependenciesSync)(cwd);
     return (dependency) => {
-        let dependencyPaths = { root: '.', dependency, fromRoot: dependency, fromModule: dependency };
+        let dependencyPaths = {
+            root: '.',
+            dependency,
+            fromRoot: dependency,
+            fromModule: dependency,
+            denormalized: dependency,
+        };
         dependencies.forEach((root, depCandidate) => {
             if (dependency.startsWith(depCandidate)) {
                 const relative = dependency.replace(depCandidate, '');
-                const fromRoot = dependency.replace(depCandidate, root);
+                const rootCandidate = dependency.replace(depCandidate, root);
+                const fromRoot = [`${rootCandidate}`, `${rootCandidate}/index`].find((location) => ['ts', 'tsx'].find((extension) => node_fs_1.default.existsSync(`${location}.${extension}`)));
+                if (!fromRoot)
+                    throw Error("Can't find plugin target");
+                const denormalized = fromRoot.replace(root, depCandidate);
                 dependencyPaths = {
                     root,
                     dependency,
+                    denormalized,
                     fromRoot,
                     fromModule: !relative ? '.' : `./${relative.split('/')[relative.split('/').length - 1]}`,
                 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-config",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "4.31.0-canary.1",
+  "version": "4.31.0-canary.2",
   "type": "commonjs",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -13,7 +13,7 @@
     "prepack": "yarn build"
   },
   "dependencies": {
-    "@graphcommerce/cli": "4.31.0-canary.1",
+    "@graphcommerce/cli": "4.31.0-canary.2",
     "@lingui/loader": "^3.14.0",
     "@swc/core": "^1.3.10",
     "js-yaml-loader": "^1.2.2",

package/src/interceptors/InterceptorPlugin.ts

@@ -8,6 +8,8 @@ import { writeInterceptors } from './writeInterceptors'
 export class InterceptorPlugin {
   private interceptors: GenerateInterceptorsReturn
 
+  private interceptorByDepependency: GenerateInterceptorsReturn
+
   private resolveDependency: ResolveDependency
 
   constructor() {
@@ -15,6 +17,10 @@ export class InterceptorPlugin {
 
     this.watched = this.watchList()
     this.interceptors = generateInterceptors(findPlugins(), this.resolveDependency)
+    this.interceptorByDepependency = Object.fromEntries(
+      Object.values(this.interceptors).map((i) => [i.dependency, i]),
+    )
+
     writeInterceptors(this.interceptors)
   }
 
@@ -48,6 +54,9 @@ export class InterceptorPlugin {
       }
       if (added.length > 0 || removed.length > 0) {
         this.interceptors = generateInterceptors(findPlugins(), this.resolveDependency)
+        this.interceptorByDepependency = Object.fromEntries(
+          Object.values(this.interceptors).map((i) => [i.dependency, i]),
+        )
         writeInterceptors(this.interceptors)
       }
     })
@@ -66,8 +75,15 @@ export class InterceptorPlugin {
           return
         }
 
-        if (this.interceptors[requestPath]) {
-          logger.log(`Intercepting... ${this.interceptors[requestPath].fromRoot}}`)
+        const interceptorForRequest = this.interceptorByDepependency[resource.request]
+        if (interceptorForRequest) {
+          logger.log(`Intercepting... ${interceptorForRequest.dependency}`)
+          resource.request = `${interceptorForRequest.denormalized}.interceptor.tsx`
+        }
+
+        const interceptorForPath = this.interceptors[requestPath]
+        if (interceptorForPath) {
+          logger.log(`Intercepting... ${interceptorForPath.fromRoot}`)
           resource.request = `${resource.request}.interceptor.tsx`
         }
       })

package/src/utils/resolveDependency.ts

@@ -1,7 +1,9 @@
+import fs from 'node:fs'
 import { resolveDependenciesSync } from './resolveDependenciesSync'
 
 export type ResolveDependencyReturn = {
   dependency: string
+  denormalized: string
   root: string
   fromRoot: string
   fromModule: string
@@ -12,16 +14,29 @@ export type ResolveDependency = (req: string) => ResolveDependencyReturn
 export const resolveDependency = (cwd: string = process.cwd()) => {
   const dependencies = resolveDependenciesSync(cwd)
   return (dependency: string): ResolveDependencyReturn => {
-    let dependencyPaths = { root: '.', dependency, fromRoot: dependency, fromModule: dependency }
+    let dependencyPaths = {
+      root: '.',
+      dependency,
+      fromRoot: dependency,
+      fromModule: dependency,
+      denormalized: dependency,
+    }
 
     dependencies.forEach((root, depCandidate) => {
       if (dependency.startsWith(depCandidate)) {
         const relative = dependency.replace(depCandidate, '')
-        const fromRoot = dependency.replace(depCandidate, root)
+
+        const rootCandidate = dependency.replace(depCandidate, root)
+        const fromRoot = [`${rootCandidate}`, `${rootCandidate}/index`].find((location) =>
+          ['ts', 'tsx'].find((extension) => fs.existsSync(`${location}.${extension}`)),
+        )
+        if (!fromRoot) throw Error("Can't find plugin target")
+        const denormalized = fromRoot.replace(root, depCandidate)
 
         dependencyPaths = {
           root,
           dependency,
+          denormalized,
           fromRoot,
           fromModule: !relative ? '.' : `./${relative.split('/')[relative.split('/').length - 1]}`,
         }