@graphcommerce/next-config 9.1.0-canary.54 → 10.0.0-canary.56

package/src/interceptors/writeInterceptors.ts

@@ -1,56 +1,111 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
+import { stat } from 'node:fs'
 import fs from 'node:fs/promises'
 import path from 'path'
-import { sync as globSync } from 'glob'
-import { resolveDependenciesSync } from '../utils/resolveDependenciesSync'
+import { glob } from 'glob'
+import { findParentPath } from '../utils/findParentPath'
 import type { GenerateInterceptorsReturn } from './generateInterceptors'
 
-function checkFileExists(file: string) {
-  return fs
-    .access(file, fs.constants.F_OK)
-    .then(() => true)
-    .catch(() => false)
+export async function fsExists(file: string): Promise<boolean> {
+  try {
+    await fs.access(file, fs.constants.F_OK)
+    return true
+  } catch {
+    return false
+  }
+}
+export async function fsRealpath(file: string): Promise<string> {
+  return (await fsExists(file)) ? fs.realpath(file) : file
+}
+
+export async function restoreOriginalFile(fileWithOriginalInTheName: string): Promise<boolean> {
+  const restoredPath = fileWithOriginalInTheName.replace(/\.original\.(tsx?)$/, '.$1')
+
+  if (await fsExists(fileWithOriginalInTheName)) {
+    // Remove the current interceptor file if it exists
+    if (await fsExists(restoredPath)) {
+      await fs.unlink(restoredPath)
+    }
+    // Restore the original file
+    await fs.rename(fileWithOriginalInTheName, restoredPath)
+    return true
+  }
+  return false
+}
+
+export async function findDotOriginalFiles(cwd: string) {
+  let parentPath = findParentPath(process.cwd())
+  while (parentPath) {
+    const p = findParentPath(parentPath)
+    if (p) parentPath = p
+    else break
+  }
+
+  return Promise.all(
+    (
+      await glob([`${parentPath}/**/*.original.tsx`, `${parentPath}/**/*.original.ts`], { cwd })
+    ).map((file) => fs.realpath(file)),
+  )
 }
 
 export async function writeInterceptors(
   interceptors: GenerateInterceptorsReturn,
   cwd: string = process.cwd(),
 ) {
-  const dependencies = resolveDependenciesSync(cwd)
-  const existing = new Set<string>()
-  dependencies.forEach((dependency) => {
-    const files = globSync(
-      [`${dependency}/**/*.interceptor.tsx`, `${dependency}/**/*.interceptor.ts`],
-      { cwd },
-    )
-    files.forEach((file) => existing.add(file))
-  })
+  const processedFiles: string[] = []
+  const existingDotOriginalFiles = findDotOriginalFiles(cwd)
 
+  // Process each interceptor
   const written = Object.entries(interceptors).map(async ([, plugin]) => {
     const extension = plugin.sourcePath.endsWith('.tsx') ? '.tsx' : '.ts'
-    const relativeFile = `${plugin.fromRoot}.interceptor${extension}`
 
-    if (existing.has(relativeFile)) {
-      existing.delete(relativeFile)
-    }
-    if (existing.has(`./${relativeFile}`)) {
-      existing.delete(`./${relativeFile}`)
-    }
+    const targetFileName = `${plugin.fromRoot}${extension}`
+    const fileNameDotOriginal = `${plugin.fromRoot}.original${extension}`
+    const targetFilePath = await fsRealpath(path.resolve(cwd, targetFileName))
+    const dotOriginalPath = await fsRealpath(path.resolve(cwd, fileNameDotOriginal))
 
-    const fileToWrite = path.join(cwd, relativeFile)
+    processedFiles.push(dotOriginalPath)
 
-    const isSame =
-      (await checkFileExists(fileToWrite)) &&
-      (await fs.readFile(fileToWrite, 'utf8')).toString() === plugin.template
+    const targetSource = (await fsExists(targetFilePath))
+      ? await fs.readFile(targetFilePath, 'utf8')
+      : null
 
-    if (!isSame) await fs.writeFile(fileToWrite, plugin.template)
-  })
+    const dotOriginalSource = (await fsExists(dotOriginalPath))
+      ? await fs.readFile(dotOriginalPath, 'utf8')
+      : null
 
-  // Cleanup unused interceptors
-  const cleaned = [...existing].map(
-    async (file) => (await checkFileExists(file)) && (await fs.unlink(file)),
-  )
+    const isPreviouslyApplied = dotOriginalSource !== null && targetSource?.includes('/* hash:')
+
+    let status = ''
+    if (isPreviouslyApplied) {
+      if (targetSource === plugin.template) {
+        status = '✅ Unchanged interceptor'
+      } else {
+        status = '🔄 Updating interceptor'
+        await fs.writeFile(targetFilePath, plugin.template)
+      }
+    } else {
+      status = '🆕 Creating interceptor'
+      await fs.rename(targetFilePath, dotOriginalPath)
+      await fs.writeFile(targetFilePath, plugin.template)
+    }
+
+    console.log(`${status} ${plugin.dependency}`)
+    Object.entries(plugin.targetExports).forEach(([target, plugins]) => {
+      plugins.forEach((plugin) => {
+        console.log(`  🔌 ${target} <- ${plugin.sourceModule}`)
+      })
+    })
+  })
 
   await Promise.all(written)
-  await Promise.all(cleaned)
+
+  const toRestore = (await existingDotOriginalFiles).filter(
+    (file) => !processedFiles.includes(file),
+  )
+  await Promise.all(
+    toRestore.map((file) => {
+      console.log(`↩ Removing old interceptor ${file}`)
+      return restoreOriginalFile(file)
+    }),
+  )
 }

package/src/types.ts

@@ -0,0 +1,26 @@
+import type React from 'react'
+import type { Path, PathValue } from 'react-hook-form'
+import type { GraphCommerceConfig } from './generated/config'
+
+export type PluginProps<P extends Record<string, unknown> = Record<string, unknown>> = P & {
+  Prev: React.FC<P>
+}
+
+export type FunctionPlugin<T extends (...args: any[]) => any> = (
+  prev: T,
+  ...args: Parameters<T>
+) => ReturnType<T>
+
+/** @deprecated Use FunctionPlugin instead */
+export type MethodPlugin<T extends (...args: any[]) => any> = (
+  prev: T,
+  ...args: Parameters<T>
+) => ReturnType<T>
+
+export type PluginConfig<P extends Path<GraphCommerceConfig> = Path<GraphCommerceConfig>> = {
+  type: PluginType
+  module: string
+  ifConfig?: P | [P, PathValue<GraphCommerceConfig, P>]
+}
+
+export type PluginType = 'component' | 'function' | 'replace'

package/src/utils/index.ts

@@ -0,0 +1,7 @@
+export * from './findParentPath'
+export * from './packageRoots'
+export * from './PackagesSort'
+export * from './resolveDependenciesSync'
+export * from './resolveDependency'
+export * from './sig'
+export * from './TopologicalSort'

package/src/utils/resolveDependenciesSync.ts

@@ -10,7 +10,10 @@ type DependencyStructure = Record<string, { dirName: string; dependencies: strin
 const resolveCache: Map<string, PackageNames> = new Map<string, PackageNames>()
 
 function findPackageJson(id: string, root: string) {
-  let dir = id.startsWith('/') ? id : require.resolve(id)
+  let dir = id.startsWith('/') ? id : import.meta.resolve(id)
+
+  if (dir.startsWith('file://')) dir = new URL(dir).pathname
+
   let packageJsonLocation = path.join(dir, 'package.json')
   while (!fs.existsSync(packageJsonLocation)) {
     dir = path.dirname(dir)
@@ -28,12 +31,7 @@ function resolveRecursivePackageJson(
 ) {
   const isRoot = dependencyPath === root
 
-  let fileName: string
-  try {
-    fileName = require.resolve(path.join(dependencyPath, 'package.json'))
-  } catch (e) {
-    fileName = findPackageJson(dependencyPath, root)
-  }
+  const fileName = findPackageJson(dependencyPath, root)
   if (!fileName) throw Error(`Can't find package.json for ${dependencyPath}`)
 
   const packageJsonFile = fs.readFileSync(fileName, 'utf-8').toString()

package/src/withGraphCommerce.ts

@@ -3,11 +3,8 @@
 import type { NextConfig } from 'next'
 import type { DomainLocale } from 'next/dist/server/config'
 import type { Configuration } from 'webpack'
-import webpack from 'webpack'
 import { loadConfig } from './config/loadConfig'
-import { configToImportMeta } from './config/utils/configToImportMeta'
 import type { GraphCommerceConfig } from './generated/config'
-import { InterceptorPlugin } from './interceptors/InterceptorPlugin'
 import { resolveDependenciesSync } from './utils/resolveDependenciesSync'
 
 let graphcommerceConfig: GraphCommerceConfig
@@ -33,7 +30,7 @@ function domains(config: GraphCommerceConfig): DomainLocale[] {
 }
 
 /**
- * GraphCommerce configuration: .
+ * GraphCommerce configuration with new Turbopack-compatible interceptor system.
  *
  * ```ts
  * const { withGraphCommerce } = require('@graphcommerce/next-config')
@@ -43,7 +40,6 @@ function domains(config: GraphCommerceConfig): DomainLocale[] {
  */
 export function withGraphCommerce(nextConfig: NextConfig, cwd: string = process.cwd()): NextConfig {
   graphcommerceConfig ??= loadConfig(cwd)
-  const importMetaPaths = configToImportMeta(graphcommerceConfig)
 
   const { storefront } = graphcommerceConfig
 
@@ -55,10 +51,36 @@ export function withGraphCommerce(nextConfig: NextConfig, cwd: string = process.
   return {
     ...nextConfig,
     bundlePagesRouterDependencies: true,
+    serverExternalPackages: [
+      // All @whatwg-node packages to prevent private class field bundling issues
+      // https://github.com/ardatan/whatwg-node/tree/master/packages
+      '@whatwg-node/cookie-store',
+      '@whatwg-node/disposablestack',
+      '@whatwg-node/events',
+      '@whatwg-node/fetch',
+      '@whatwg-node/node-fetch',
+      '@whatwg-node/promise-helpers',
+      '@whatwg-node/server',
+      '@whatwg-node/server-plugin-cookies',
+      ...(nextConfig.serverExternalPackages ?? []),
+    ],
+    turbopack: {
+      ...(nextConfig.turbopack ?? {}),
+      rules: {
+        ...(nextConfig.turbopack?.rules ?? {}),
+        '*.yaml': { loaders: [{ loader: 'js-yaml-loader', options: {} }], as: '*.js' },
+        '*.yml': { loaders: [{ loader: 'js-yaml-loader', options: {} }], as: '*.js' },
+        '*.po': { loaders: [{ loader: '@lingui/loader', options: {} }], as: '*.js' },
+      },
+    },
     experimental: {
       ...nextConfig.experimental,
       scrollRestoration: true,
       swcPlugins: [...(nextConfig.experimental?.swcPlugins ?? []), ['@lingui/swc-plugin', {}]],
+      optimizePackageImports: [
+        ...transpilePackages,
+        ...(nextConfig.experimental?.optimizePackageImports ?? []),
+      ],
     },
     i18n: {
       ...nextConfig.i18n,
@@ -69,6 +91,8 @@ export function withGraphCommerce(nextConfig: NextConfig, cwd: string = process.
     },
     images: {
       ...nextConfig.images,
+      // GraphCommerce uses quality 52 by default for optimized image delivery
+      qualities: [52, 75, ...(nextConfig.images?.qualities ?? [])],
       remotePatterns: [
         'magentoEndpoint' in graphcommerceConfig
           ? {
@@ -92,7 +116,7 @@ export function withGraphCommerce(nextConfig: NextConfig, cwd: string = process.
         typeof graphcommerceConfig.productRoute === 'string' &&
         graphcommerceConfig.productRoute !== '/p/'
       ) {
-        rewrites.beforeFiles.push({
+        rewrites.beforeFiles?.push({
           source: `${graphcommerceConfig.productRoute ?? '/p/'}:path*`,
           destination: '/p/:path*',
         })
@@ -118,37 +142,6 @@ export function withGraphCommerce(nextConfig: NextConfig, cwd: string = process.
 
       if (!config.plugins) config.plugins = []
 
-      // Make import.meta.graphCommerce available for usage.
-      config.plugins.push(new webpack.DefinePlugin(importMetaPaths))
-
-      // To properly properly treeshake @apollo/client we need to define the __DEV__ property
-      config.plugins.push(new webpack.DefinePlugin({ 'globalThis.__DEV__': options.dev }))
-
-      if (!options.isServer) {
-        // if (graphcommerceConfig.debug?.webpackCircularDependencyPlugin) {
-        //   config.plugins.push(
-        //     new CircularDependencyPlugin({
-        //       exclude: /readable-stream|duplexer2|node_modules\/next/,
-        //     }),
-        //   )
-        // }
-        // if (graphcommerceConfig.debug?.webpackDuplicatesPlugin) {
-        //   config.plugins.push(
-        //     new DuplicatesPlugin({
-        //       ignoredPackages: [
-        //         // very small
-        //         'react-is',
-        //         // build issue
-        //         'tslib',
-        //         // server
-        //         'isarray',
-        //         'readable-stream',
-        //       ],
-        //     }),
-        //   )
-        // }
-      }
-
       config.snapshot = {
         ...(config.snapshot ?? {}),
         managedPaths: [
@@ -166,18 +159,6 @@ export function withGraphCommerce(nextConfig: NextConfig, cwd: string = process.
       }
 
       if (!config.resolve) config.resolve = {}
-      if (!options.isServer && !options.dev) {
-        config.resolve.alias = {
-          ...config.resolve.alias,
-          '@mui/base': '@mui/base/modern',
-          '@mui/lab': '@mui/lab/modern',
-          '@mui/material': '@mui/material/modern',
-          '@mui/styled-engine': '@mui/styled-engine/modern',
-          '@mui/system': '@mui/system/modern',
-        }
-      }
-
-      config.plugins.push(new InterceptorPlugin(graphcommerceConfig, !options.isServer))
 
       return typeof nextConfig.webpack === 'function' ? nextConfig.webpack(config, options) : config
     },

package/tsconfig.json

@@ -8,6 +8,8 @@
     "noLib": false,
     "noEmit": false,
     "sourceMap": false,
-    "strict": true
+    "strict": true,
+    "moduleResolution": "bundler",
+    "module": "esnext"
   }
 }

package/__tests__/config/utils/configToImportMeta.ts

@@ -1,121 +0,0 @@
-import { configToImportMeta } from '../../../src/config/utils/configToImportMeta'
-const configFile = {
-  storefront: [{ locale: 'en', hygraphLocales: ['en'], magentoStoreCode: 'en_us' }],
-  demoMode: true,
-  googleTagmanagerKey: 'GTM-XXXXXXX',
-  productFiltersPro: false,
-  deeper: { arrayvalue: ['test'], nested: { value: 'test' } },
-}
-it('flattens a config object', () => {
-  expect(configToImportMeta(configFile)).toMatchInlineSnapshot(
-    `
-    {
-      "import.meta.graphCommerce": "{ __debug: "'import.meta.graphCommerce' can not be destructured, please access deeper properties directly" }",
-      "import.meta.graphCommerce.deeper": "{ __debug: "'import.meta.graphCommerce.deeper' can not be destructured, please access deeper properties directly" }",
-      "import.meta.graphCommerce.deeper.arrayvalue": "["test"]",
-      "import.meta.graphCommerce.deeper.nested": "{ __debug: "'import.meta.graphCommerce.deeper.nested' can not be destructured, please access deeper properties directly" }",
-      "import.meta.graphCommerce.deeper.nested.value": ""test"",
-      "import.meta.graphCommerce.deeper.nested?.value": ""test"",
-      "import.meta.graphCommerce.deeper?.arrayvalue": "["test"]",
-      "import.meta.graphCommerce.deeper?.nested": "{ __debug: "'import.meta.graphCommerce.deeper?.nested' can not be destructured, please access deeper properties directly" }",
-      "import.meta.graphCommerce.deeper?.nested.value": ""test"",
-      "import.meta.graphCommerce.deeper?.nested?.value": ""test"",
-      "import.meta.graphCommerce.demoMode": "true",
-      "import.meta.graphCommerce.googleTagmanagerKey": ""GTM-XXXXXXX"",
-      "import.meta.graphCommerce.productFiltersPro": "false",
-      "import.meta.graphCommerce.storefront": "[{"locale":"en","hygraphLocales":["en"],"magentoStoreCode":"en_us"}]",
-      "import.meta.graphCommerce?.deeper": "{ __debug: "'import.meta.graphCommerce?.deeper' can not be destructured, please access deeper properties directly" }",
-      "import.meta.graphCommerce?.deeper.arrayvalue": "["test"]",
-      "import.meta.graphCommerce?.deeper.nested": "{ __debug: "'import.meta.graphCommerce?.deeper.nested' can not be destructured, please access deeper properties directly" }",
-      "import.meta.graphCommerce?.deeper.nested.value": ""test"",
-      "import.meta.graphCommerce?.deeper.nested?.value": ""test"",
-      "import.meta.graphCommerce?.deeper?.arrayvalue": "["test"]",
-      "import.meta.graphCommerce?.deeper?.nested": "{ __debug: "'import.meta.graphCommerce?.deeper?.nested' can not be destructured, please access deeper properties directly" }",
-      "import.meta.graphCommerce?.deeper?.nested.value": ""test"",
-      "import.meta.graphCommerce?.deeper?.nested?.value": ""test"",
-      "import.meta.graphCommerce?.demoMode": "true",
-      "import.meta.graphCommerce?.googleTagmanagerKey": ""GTM-XXXXXXX"",
-      "import.meta.graphCommerce?.productFiltersPro": "false",
-      "import.meta.graphCommerce?.storefront": "[{"locale":"en","hygraphLocales":["en"],"magentoStoreCode":"en_us"}]",
-    }
-  `,
-  )
-})
-it('creates keys but does not stringify values', () => {
-  expect(configToImportMeta(configFile, 'graphCommerce', false)).toMatchInlineSnapshot(
-    `
-    {
-      "graphCommerce": {
-        "deeper": {
-          "arrayvalue": [
-            "test",
-          ],
-          "nested": {
-            "value": "test",
-          },
-        },
-        "demoMode": true,
-        "googleTagmanagerKey": "GTM-XXXXXXX",
-        "productFiltersPro": false,
-        "storefront": [
-          {
-            "hygraphLocales": [
-              "en",
-            ],
-            "locale": "en",
-            "magentoStoreCode": "en_us",
-          },
-        ],
-      },
-      "graphCommerce.deeper": {
-        "arrayvalue": [
-          "test",
-        ],
-        "nested": {
-          "value": "test",
-        },
-      },
-      "graphCommerce.deeper.arrayvalue": "["test"]",
-      "graphCommerce.deeper.nested": {
-        "value": "test",
-      },
-      "graphCommerce.deeper.nested.value": "test",
-      "graphCommerce.deeper.nested?.value": "test",
-      "graphCommerce.deeper?.arrayvalue": "["test"]",
-      "graphCommerce.deeper?.nested": {
-        "value": "test",
-      },
-      "graphCommerce.deeper?.nested.value": "test",
-      "graphCommerce.deeper?.nested?.value": "test",
-      "graphCommerce.demoMode": true,
-      "graphCommerce.googleTagmanagerKey": "GTM-XXXXXXX",
-      "graphCommerce.productFiltersPro": false,
-      "graphCommerce.storefront": "[{"locale":"en","hygraphLocales":["en"],"magentoStoreCode":"en_us"}]",
-      "graphCommerce?.deeper": {
-        "arrayvalue": [
-          "test",
-        ],
-        "nested": {
-          "value": "test",
-        },
-      },
-      "graphCommerce?.deeper.arrayvalue": "["test"]",
-      "graphCommerce?.deeper.nested": {
-        "value": "test",
-      },
-      "graphCommerce?.deeper.nested.value": "test",
-      "graphCommerce?.deeper.nested?.value": "test",
-      "graphCommerce?.deeper?.arrayvalue": "["test"]",
-      "graphCommerce?.deeper?.nested": {
-        "value": "test",
-      },
-      "graphCommerce?.deeper?.nested.value": "test",
-      "graphCommerce?.deeper?.nested?.value": "test",
-      "graphCommerce?.demoMode": true,
-      "graphCommerce?.googleTagmanagerKey": "GTM-XXXXXXX",
-      "graphCommerce?.productFiltersPro": false,
-      "graphCommerce?.storefront": "[{"locale":"en","hygraphLocales":["en"],"magentoStoreCode":"en_us"}]",
-    }
-  `,
-  )
-})

package/src/interceptors/InterceptorPlugin.ts

@@ -1,141 +0,0 @@
-import path from 'path'
-import type { Compiler } from 'webpack'
-import type { GraphCommerceConfig } from '../generated/config'
-import type { ResolveDependency } from '../utils/resolveDependency'
-import { resolveDependency } from '../utils/resolveDependency'
-import { findPlugins } from './findPlugins'
-import type { GenerateInterceptorsReturn } from './generateInterceptors'
-import { generateInterceptors } from './generateInterceptors'
-import { writeInterceptors } from './writeInterceptors'
-
-let interceptors: GenerateInterceptorsReturn | undefined
-let interceptorByDepependency: GenerateInterceptorsReturn | undefined
-
-let generating = false
-
-// let totalGenerationTime = 0
-
-export class InterceptorPlugin {
-  private resolveDependency: ResolveDependency
-
-  constructor(
-    private config: GraphCommerceConfig,
-    private regenerate: boolean = false,
-  ) {
-    this.resolveDependency = resolveDependency()
-
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    if (regenerate) this.#generateInterceptors()
-  }
-
-  #generateInterceptors = async () => {
-    if (generating) return {}
-    generating = true
-    // const start = Date.now()
-
-    // console.log('Generating interceptors...')
-
-    const [plugins] = findPlugins(this.config)
-
-    // console.log(errors)
-
-    // const found = Date.now()
-    // console.log('Found plugins in', found - start, 'ms')
-
-    const generatedInterceptors = await generateInterceptors(
-      plugins,
-      this.resolveDependency,
-      this.config.debug,
-    )
-
-    // const generated = Date.now()
-    // console.log('Generated interceptors in', generated - found, 'ms')
-
-    await writeInterceptors(generatedInterceptors)
-
-    // const wrote = Date.now()
-    // console.log('Wrote interceptors in', wrote - generated, 'ms')
-
-    interceptors = generatedInterceptors
-
-    interceptorByDepependency = Object.fromEntries(
-      Object.values(interceptors).map((i) => [i.dependency, i]),
-    )
-
-    // totalGenerationTime += Date.now() - start
-    generating = false
-
-    return generatedInterceptors
-  }
-
-  /** @public */
-  apply(compiler: Compiler): void {
-    const logger = compiler.getInfrastructureLogger('InterceptorPlugin')
-
-    // After the compilation has succeeded we watch all possible plugin locations.
-    if (this.regenerate) {
-      compiler.hooks.afterCompile.tap('InterceptorPlugin', (compilation) => {
-        // console.log('generate interceptors after compile')
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const [plugins, errors] = findPlugins(this.config)
-
-        plugins.forEach((p) => {
-          const source = this.resolveDependency(p.sourceModule)
-          if (source) {
-            const absoluteFilePath = `${path.join(process.cwd(), source.fromRoot)}.tsx`
-            compilation.fileDependencies.add(absoluteFilePath)
-          }
-        })
-
-        // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        this.#generateInterceptors().then((i) => {
-          Object.entries(i).forEach(([, { sourcePath }]) => {
-            const absoluteFilePath = path.join(process.cwd(), sourcePath)
-            compilation.fileDependencies.add(absoluteFilePath)
-          })
-        })
-      })
-    }
-
-    compiler.hooks.normalModuleFactory.tap('InterceptorPlugin', (nmf) => {
-      nmf.hooks.beforeResolve.tap('InterceptorPlugin', (resource) => {
-        const issuer = resource.contextInfo.issuer ?? ''
-
-        const requestPath = path.relative(
-          process.cwd(),
-          path.resolve(resource.context, resource.request),
-        )
-
-        if (!interceptors || !interceptorByDepependency) {
-          // console.log('interceptors not ready')
-          return
-        }
-
-        const split = requestPath.split('/')
-        const targets = [
-          `${split[split.length - 1]}.interceptor.tsx`,
-          `${split[split.length - 1]}.interceptor.ts`,
-        ]
-
-        if (targets.some((target) => issuer.endsWith(target)) && interceptors[requestPath]) {
-          logger.log(`Interceptor ${issuer} is requesting the original ${requestPath}`)
-          return
-        }
-
-        const interceptorForRequest = interceptorByDepependency[resource.request]
-        if (interceptorForRequest) {
-          const extension = interceptorForRequest.sourcePath.endsWith('.tsx') ? '.tsx' : '.ts'
-          resource.request = `${interceptorForRequest.denormalized}.interceptor${extension}`
-          logger.log(`Intercepting dep... ${interceptorForRequest.dependency}`, resource.request)
-        }
-
-        const interceptorForPath = interceptors[requestPath]
-        if (interceptorForPath) {
-          const extension = interceptorForPath.sourcePath.endsWith('.tsx') ? '.tsx' : '.ts'
-          resource.request = `${resource.request}.interceptor${extension}`
-          logger.log(`Intercepting fromRoot... ${interceptorForPath.dependency}`, resource.request)
-        }
-      })
-    })
-  }
-}

package/src/interceptors/commands/codegenInterceptors.ts

@@ -1,27 +0,0 @@
-import dotenv from 'dotenv'
-import { loadConfig } from '../../config/loadConfig'
-import { resolveDependency } from '../../utils/resolveDependency'
-import { findPlugins } from '../findPlugins'
-import { generateInterceptors } from '../generateInterceptors'
-import { writeInterceptors } from '../writeInterceptors'
-
-dotenv.config()
-
-// eslint-disable-next-line @typescript-eslint/require-await
-export async function codegenInterceptors() {
-  const conf = loadConfig(process.cwd())
-
-  const [plugins] = findPlugins(conf)
-
-  const generatedInterceptors = await generateInterceptors(
-    plugins,
-    resolveDependency(),
-    conf.debug,
-    true,
-  )
-
-  // const generated = Date.now()
-  // console.log('Generated interceptors in', generated - found, 'ms')
-
-  await writeInterceptors(generatedInterceptors)
-}