feat: moduleResolution: bundler in config loaders

packages/payload/src/bin/register/index.ts

@@ -27,7 +27,13 @@ const locatedConfig = getTsconfig()
 const tsconfig = locatedConfig.config.compilerOptions as unknown as ts.CompilerOptions
 
 tsconfig.module = ts.ModuleKind.ESNext
-tsconfig.moduleResolution = ts.ModuleResolutionKind.NodeNext
+
+// Specify bundler resolution for Next.js compatibility.
+// We will use TS to resolve file paths for most flexibility
+tsconfig.moduleResolution = ts.ModuleResolutionKind.Bundler
+
+// Don't resolve d.ts files, because we aren't type-checking
+tsconfig.noDtsResolution = true
 
 const moduleResolutionCache = ts.createModuleResolutionCache(
   ts.sys.getCurrentDirectory(),
@@ -78,16 +84,21 @@ export const resolve: ResolveFn = async (specifier, context, nextResolve) => {
   )
 
   // import from local project to local project TS file
-  if (
-    resolvedModule &&
-    !resolvedModule.resolvedFileName.includes('/node_modules/') &&
-    EXTENSIONS.includes(resolvedModule.extension)
-  ) {
-    return {
-      format: 'ts',
-      shortCircuit: true,
-      url: pathToFileURL(resolvedModule.resolvedFileName).href,
+  if (resolvedModule) {
+    const resolvedIsNodeModule = resolvedModule.resolvedFileName.includes('/node_modules/')
+    const resolvedIsTS = EXTENSIONS.includes(resolvedModule.extension)
+
+    if (!resolvedIsNodeModule && resolvedIsTS) {
+      return {
+        format: 'ts',
+        shortCircuit: true,
+        url: pathToFileURL(resolvedModule.resolvedFileName).href,
+      }
     }
+
+    // We want to use TS "Bundler" moduleResolution for just about all files
+    // so we pass the TS result here
+    return nextResolve(pathToFileURL(resolvedModule.resolvedFileName).href)
   }
 
   // import from local project to either:

test/config-loader/int.spec.ts

@@ -0,0 +1,8 @@
+import { load } from './load.js'
+
+describe('Config Loader', () => {
+  it('should load using TS moduleResolution: bundler', async () => {
+    const file = await load('./next-navigation-test.js')
+    expect(typeof file.redirect).toStrictEqual('function')
+  })
+})

test/config-loader/load.ts

@@ -0,0 +1,16 @@
+import { register } from 'node:module'
+import path from 'node:path'
+import { fileURLToPath, pathToFileURL } from 'node:url'
+
+export const load = async (filePath) => {
+  const filename = fileURLToPath(import.meta.url)
+  const dirname = path.dirname(filename)
+  const url = pathToFileURL(dirname).toString() + '/'
+
+  // Need to register loader from payload/dist for a true test of functionality
+  register('../../packages/payload/dist/bin/register/index.js', url)
+
+  const result = await import(filePath)
+
+  return result
+}

test/config-loader/next-navigation-test.js

@@ -0,0 +1,3 @@
+import { redirect } from 'next/navigation'
+
+export { redirect }

test/tsconfig.json

@@ -25,6 +25,7 @@
         "name": "next"
       }
     ],
+    "baseUrl": ".",
     "paths": {
       "@payloadcms/ui/assets": ["./packages/ui/src/assets/index.ts"],
       "@payloadcms/ui/elements/*": ["./packages/ui/src/elements/*/index.tsx"],

tsconfig.json

@@ -164,4 +164,4 @@
     ".next/types/**/*.ts",
     "scripts/**/*.ts"
   ]
-}
+}