@graphcommerce/next-config 5.1.0-canary.3 → 5.1.0-canary.4

package/dist/interceptors/InterceptorPlugin.d.ts

@@ -4,7 +4,5 @@ export declare class InterceptorPlugin {
     private interceptorByDepependency;
     private resolveDependency;
     constructor();
-    private watched;
-    watchList(): string[];
     apply(compiler: Compiler): void;
 }

package/dist/interceptors/InterceptorPlugin.js

@@ -11,39 +11,23 @@ const generateInterceptors_1 = require("./generateInterceptors");
 const writeInterceptors_1 = require("./writeInterceptors");
 class InterceptorPlugin {
     constructor() {
-        this.watched = [];
         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() {
-        return [
-            ...new Set((0, findPlugins_1.findPlugins)()
-                .map((p) => this.resolveDependency(p.plugin))
-                .map((p) => p.fromRoot)),
-        ];
-    }
     apply(compiler) {
         const logger = compiler.getInfrastructureLogger('InterceptorPlugin');
         // After the compilation has succeeded we watch all possible plugin locations.
         compiler.hooks.afterCompile.tap('InterceptorPlugin', (compilation) => {
-            const watchList = this.watchList();
-            const added = watchList.filter((d) => !this.watched.includes(d));
-            const removed = this.watched.filter((d) => !watchList.includes(d));
-            this.watched = watchList;
-            if (added.length > 0) {
-                added.forEach((context) => compilation.contextDependencies.add(context));
-            }
-            if (removed.length > 0) {
-                removed.forEach((context) => compilation.contextDependencies.delete(context));
-            }
-            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);
-            }
+            const plugins = (0, findPlugins_1.findPlugins)();
+            plugins.forEach((p) => {
+                const absoluteFilePath = `${path_1.default.join(process.cwd(), this.resolveDependency(p.plugin).fromRoot)}.tsx`;
+                compilation.fileDependencies.add(absoluteFilePath);
+            });
+            this.interceptors = (0, generateInterceptors_1.generateInterceptors)(plugins, this.resolveDependency);
+            this.interceptorByDepependency = Object.fromEntries(Object.values(this.interceptors).map((i) => [i.dependency, i]));
+            (0, writeInterceptors_1.writeInterceptors)(this.interceptors);
         });
         compiler.hooks.normalModuleFactory.tap('InterceptorPlugin', (nmf) => {
             nmf.hooks.beforeResolve.tap('InterceptorPlugin', (resource) => {

package/dist/interceptors/findPlugins.js

@@ -47,9 +47,7 @@ function parseStructure(file) {
             // console.log('hallo', node)
         }
     });
-    return exports.component && exports.exported
-        ? exports
-        : undefined;
+    return exports;
 }
 function findPlugins(cwd = process.cwd()) {
     const dependencies = (0, resolveDependenciesSync_1.resolveDependenciesSync)(cwd);
@@ -61,8 +59,7 @@ function findPlugins(cwd = process.cwd()) {
                 const result = parseStructure(file);
                 if (!result)
                     return;
-                if (result.ifEnv && !process.env[result.ifEnv])
-                    return;
+                // if (result.ifEnv && !process.env[result.ifEnv]) return
                 plugins.push({ ...result, plugin: file.replace(dependency, path).replace('.tsx', '') });
             }
             catch (e) {

package/dist/interceptors/generateInterceptors.d.ts

@@ -1,7 +1,7 @@
 import { ResolveDependency, ResolveDependencyReturn } from '../utils/resolveDependency';
 export type PluginConfig = {
-    component: string;
-    exported: string;
+    component?: string;
+    exported?: string;
     plugin: string;
     ifEnv?: string;
 };

package/dist/interceptors/generateInterceptors.js

@@ -4,7 +4,7 @@ exports.generateInterceptors = exports.generateInterceptor = void 0;
 function generateInterceptor(plugin) {
     const { fromModule, dependency, components } = plugin;
     const pluginImports = Object.entries(components)
-        .map(([_, plugins]) => {
+        .map(([, plugins]) => {
         const duplicateImports = new Set();
         return plugins
             .sort((a, b) => a.plugin.localeCompare(b.plugin))
@@ -74,7 +74,9 @@ exports.generateInterceptor = generateInterceptor;
 function generateInterceptors(plugins, resolve) {
     // todo: Do not use reduce as we're passing the accumulator to the next iteration
     const byExportedComponent = plugins.reduce((acc, plug) => {
-        const { exported } = plug;
+        const { exported, component } = plug;
+        if (!exported || !component)
+            return acc;
         const resolved = resolve(exported);
         if (!acc[resolved.fromRoot])
             acc[resolved.fromRoot] = {
@@ -82,9 +84,9 @@ function generateInterceptors(plugins, resolve) {
                 target: `${resolved.fromRoot}.interceptor`,
                 components: {},
             };
-        if (!acc[resolved.fromRoot].components[plug.component])
-            acc[resolved.fromRoot].components[plug.component] = [];
-        acc[resolved.fromRoot].components[plug.component].push(plug);
+        if (!acc[resolved.fromRoot].components[component])
+            acc[resolved.fromRoot].components[component] = [];
+        acc[resolved.fromRoot].components[component].push(plug);
         return acc;
     }, {});
     return Object.fromEntries(Object.entries(byExportedComponent).map(([target, plg]) => [target, generateInterceptor(plg)]));

package/dist/interceptors/writeInterceptors.js

@@ -6,14 +6,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeInterceptors = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const path_1 = __importDefault(require("path"));
+const glob_1 = __importDefault(require("glob"));
+const resolveDependenciesSync_1 = require("../utils/resolveDependenciesSync");
 function writeInterceptors(interceptors, cwd = process.cwd()) {
-    Object.entries(interceptors).forEach(([target, plugin]) => {
-        // eslint-disable-next-line no-console
-        const fileToWrite = `${path_1.default.join(cwd, plugin.fromRoot)}.interceptor.tsx`;
-        if (!node_fs_1.default.existsSync(fileToWrite) ||
-            node_fs_1.default.readFileSync(fileToWrite, 'utf8').toString() !== plugin.template) {
-            node_fs_1.default.writeFileSync(fileToWrite, plugin.template);
+    const dependencies = (0, resolveDependenciesSync_1.resolveDependenciesSync)(cwd);
+    const existing = [];
+    dependencies.forEach((dependency) => {
+        const files = glob_1.default.sync(`${dependency}/**/*.interceptor.tsx`, { cwd });
+        existing.push(...files);
+    });
+    Object.entries(interceptors).forEach(([, plugin]) => {
+        const relativeFile = `${plugin.fromRoot}.interceptor.tsx`;
+        if (existing.includes(relativeFile)) {
+            delete existing[existing.indexOf(relativeFile)];
         }
+        const fileToWrite = path_1.default.join(cwd, relativeFile);
+        const isSame = node_fs_1.default.existsSync(fileToWrite) &&
+            node_fs_1.default.readFileSync(fileToWrite, 'utf8').toString() === plugin.template;
+        if (!isSame)
+            node_fs_1.default.writeFileSync(fileToWrite, plugin.template);
     });
+    // Cleanup unused interceptors
+    existing.forEach((file) => node_fs_1.default.unlinkSync(file));
 }
 exports.writeInterceptors = writeInterceptors;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-config",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "5.1.0-canary.3",
+  "version": "5.1.0-canary.4",
   "type": "commonjs",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/interceptors/InterceptorPlugin.ts

@@ -15,7 +15,6 @@ export class InterceptorPlugin {
   constructor() {
     this.resolveDependency = resolveDependency()
 
-    this.watched = this.watchList()
     this.interceptors = generateInterceptors(findPlugins(), this.resolveDependency)
     this.interceptorByDepependency = Object.fromEntries(
       Object.values(this.interceptors).map((i) => [i.dependency, i]),
@@ -24,41 +23,26 @@ export class InterceptorPlugin {
     writeInterceptors(this.interceptors)
   }
 
-  private watched: string[] = []
-
-  watchList() {
-    return [
-      ...new Set(
-        findPlugins()
-          .map((p) => this.resolveDependency(p.plugin))
-          .map((p) => p.fromRoot),
-      ),
-    ]
-  }
-
   apply(compiler: Compiler): void {
     const logger = compiler.getInfrastructureLogger('InterceptorPlugin')
 
     // After the compilation has succeeded we watch all possible plugin locations.
     compiler.hooks.afterCompile.tap('InterceptorPlugin', (compilation) => {
-      const watchList = this.watchList()
-      const added = watchList.filter((d) => !this.watched.includes(d))
-      const removed = this.watched.filter((d) => !watchList.includes(d))
-      this.watched = watchList
+      const plugins = findPlugins()
 
-      if (added.length > 0) {
-        added.forEach((context) => compilation.contextDependencies.add(context))
-      }
-      if (removed.length > 0) {
-        removed.forEach((context) => compilation.contextDependencies.delete(context))
-      }
-      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)
-      }
+      plugins.forEach((p) => {
+        const absoluteFilePath = `${path.join(
+          process.cwd(),
+          this.resolveDependency(p.plugin).fromRoot,
+        )}.tsx`
+        compilation.fileDependencies.add(absoluteFilePath)
+      })
+
+      this.interceptors = generateInterceptors(plugins, this.resolveDependency)
+      this.interceptorByDepependency = Object.fromEntries(
+        Object.values(this.interceptors).map((i) => [i.dependency, i]),
+      )
+      writeInterceptors(this.interceptors)
     })
 
     compiler.hooks.normalModuleFactory.tap('InterceptorPlugin', (nmf) => {

package/src/interceptors/findPlugins.ts

@@ -4,12 +4,12 @@ import { resolveDependenciesSync } from '../utils/resolveDependenciesSync'
 import type { PluginConfig } from './generateInterceptors'
 
 type ParseResult = {
-  component: string
-  exported: string
+  component?: string
+  exported?: string
   ifEnv?: string
 }
 
-function parseStructure(file: string): ParseResult | undefined {
+function parseStructure(file: string): ParseResult {
   const ast = parseFileSync(file, { syntax: 'typescript', tsx: true })
   // const ast = swc.parseFileSync(file, { syntax: 'typescript' })
 
@@ -52,9 +52,7 @@ function parseStructure(file: string): ParseResult | undefined {
     }
   })
 
-  return exports.component && exports.exported
-    ? (exports as { component: string; exported: string })
-    : undefined
+  return exports as ParseResult
 }
 
 export function findPlugins(cwd: string = process.cwd()) {
@@ -67,7 +65,7 @@ export function findPlugins(cwd: string = process.cwd()) {
       try {
         const result = parseStructure(file)
         if (!result) return
-        if (result.ifEnv && !process.env[result.ifEnv]) return
+        // if (result.ifEnv && !process.env[result.ifEnv]) return
 
         plugins.push({ ...result, plugin: file.replace(dependency, path).replace('.tsx', '') })
       } catch (e) {
@@ -75,5 +73,6 @@ export function findPlugins(cwd: string = process.cwd()) {
       }
     })
   })
+
   return plugins
 }

package/src/interceptors/generateInterceptors.ts

@@ -1,8 +1,8 @@
 import { ResolveDependency, ResolveDependencyReturn } from '../utils/resolveDependency'
 
 export type PluginConfig = {
-  component: string
-  exported: string
+  component?: string
+  exported?: string
   plugin: string
   ifEnv?: string
 }
@@ -19,7 +19,7 @@ export function generateInterceptor(plugin: Plugin): MaterializedPlugin {
   const { fromModule, dependency, components } = plugin
 
   const pluginImports = Object.entries(components)
-    .map(([_, plugins]) => {
+    .map(([, plugins]) => {
       const duplicateImports = new Set()
       return plugins
         .sort((a, b) => a.plugin.localeCompare(b.plugin))
@@ -109,7 +109,9 @@ export function generateInterceptors(
 ): GenerateInterceptorsReturn {
   // todo: Do not use reduce as we're passing the accumulator to the next iteration
   const byExportedComponent = plugins.reduce((acc, plug) => {
-    const { exported } = plug
+    const { exported, component } = plug
+    if (!exported || !component) return acc
+
     const resolved = resolve(exported)
 
     if (!acc[resolved.fromRoot])
@@ -119,10 +121,10 @@ export function generateInterceptors(
         components: {},
       } as Plugin
 
-    if (!acc[resolved.fromRoot].components[plug.component])
-      acc[resolved.fromRoot].components[plug.component] = []
+    if (!acc[resolved.fromRoot].components[component])
+      acc[resolved.fromRoot].components[component] = []
 
-    acc[resolved.fromRoot].components[plug.component].push(plug)
+    acc[resolved.fromRoot].components[component].push(plug)
     return acc
   }, {} as Record<string, Plugin>)
 

package/src/interceptors/writeInterceptors.ts

@@ -1,20 +1,35 @@
 import fs from 'node:fs'
 import path from 'path'
+import glob from 'glob'
+import { resolveDependenciesSync } from '../utils/resolveDependenciesSync'
 import { GenerateInterceptorsReturn } from './generateInterceptors'
 
 export function writeInterceptors(
   interceptors: GenerateInterceptorsReturn,
   cwd: string = process.cwd(),
 ) {
-  Object.entries(interceptors).forEach(([target, plugin]) => {
-    // eslint-disable-next-line no-console
-    const fileToWrite = `${path.join(cwd, plugin.fromRoot)}.interceptor.tsx`
+  const dependencies = resolveDependenciesSync(cwd)
+  const existing: string[] = []
+  dependencies.forEach((dependency) => {
+    const files = glob.sync(`${dependency}/**/*.interceptor.tsx`, { cwd })
+    existing.push(...files)
+  })
+
+  Object.entries(interceptors).forEach(([, plugin]) => {
+    const relativeFile = `${plugin.fromRoot}.interceptor.tsx`
 
-    if (
-      !fs.existsSync(fileToWrite) ||
-      fs.readFileSync(fileToWrite, 'utf8').toString() !== plugin.template
-    ) {
-      fs.writeFileSync(fileToWrite, plugin.template)
+    if (existing.includes(relativeFile)) {
+      delete existing[existing.indexOf(relativeFile)]
     }
+    const fileToWrite = path.join(cwd, relativeFile)
+
+    const isSame =
+      fs.existsSync(fileToWrite) &&
+      fs.readFileSync(fileToWrite, 'utf8').toString() === plugin.template
+
+    if (!isSame) fs.writeFileSync(fileToWrite, plugin.template)
   })
+
+  // Cleanup unused interceptors
+  existing.forEach((file) => fs.unlinkSync(file))
 }

package/dist/interceptors/rmInterceptors.d.ts

@@ -1 +0,0 @@
-export declare function rmInterceptors(cwd?: string): string[];

package/dist/interceptors/rmInterceptors.js

@@ -1,22 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rmInterceptors = void 0;
-const node_fs_1 = __importDefault(require("node:fs"));
-const glob_1 = __importDefault(require("glob"));
-const resolveDependenciesSync_1 = require("../utils/resolveDependenciesSync");
-function rmInterceptors(cwd = process.cwd()) {
-    const dependencies = (0, resolveDependenciesSync_1.resolveDependenciesSync)(cwd);
-    const removed = [];
-    dependencies.forEach((dependency) => {
-        const files = glob_1.default.sync(`${dependency}/**/*.interceptor.tsx`, { cwd });
-        files.forEach((file) => {
-            node_fs_1.default.unlinkSync(file);
-            removed.push(file);
-        });
-    });
-    return removed;
-}
-exports.rmInterceptors = rmInterceptors;

package/src/interceptors/rmInterceptors.ts

@@ -1,17 +0,0 @@
-import fs from 'node:fs'
-import glob from 'glob'
-import { resolveDependenciesSync } from '../utils/resolveDependenciesSync'
-
-export function rmInterceptors(cwd: string = process.cwd()): string[] {
-  const dependencies = resolveDependenciesSync(cwd)
-
-  const removed: string[] = []
-  dependencies.forEach((dependency) => {
-    const files = glob.sync(`${dependency}/**/*.interceptor.tsx`, { cwd })
-    files.forEach((file) => {
-      fs.unlinkSync(file)
-      removed.push(file)
-    })
-  })
-  return removed
-}