fix: use resolve as a normal module

vercel · Nov 25, 2020 · def3d74 · def3d74
1 parent 22d414e
commit def3d74
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 30 deletions.
diff --git a/packages/next/build/plugins/collect-plugins.ts b/packages/next/build/plugins/collect-plugins.ts
@@ -1,7 +1,7 @@
 import findUp from 'next/dist/compiled/find-up'
 import { promises } from 'fs'
 import path from 'path'
-import resolve from 'next/dist/compiled/resolve/index.js'
+import resolve from 'resolve'
 import { execOnce } from '../../next-server/lib/utils'
 
 const { version } = require('next/package.json')

diff --git a/packages/next/compiled/debug/index.js b/packages/next/compiled/debug/index.js
diff --git a/packages/next/compiled/find-cache-dir/index.js b/packages/next/compiled/find-cache-dir/index.js
diff --git a/packages/next/compiled/http-proxy/index.js b/packages/next/compiled/http-proxy/index.js
diff --git a/packages/next/compiled/ora/index.js b/packages/next/compiled/ora/index.js
diff --git a/packages/next/compiled/postcss-flexbugs-fixes/index.js b/packages/next/compiled/postcss-flexbugs-fixes/index.js
diff --git a/packages/next/compiled/postcss-loader/cjs.js b/packages/next/compiled/postcss-loader/cjs.js
diff --git a/packages/next/compiled/postcss-preset-env/index.js b/packages/next/compiled/postcss-preset-env/index.js
diff --git a/packages/next/compiled/postcss-scss/scss-syntax.js b/packages/next/compiled/postcss-scss/scss-syntax.js
diff --git a/packages/next/compiled/strip-ansi/index.js b/packages/next/compiled/strip-ansi/index.js
diff --git a/packages/next/compiled/terser-webpack-plugin/cjs.js b/packages/next/compiled/terser-webpack-plugin/cjs.js
diff --git a/packages/next/compiled/terser/bundle.min.js b/packages/next/compiled/terser/bundle.min.js
diff --git a/packages/next/lib/resolve-request.ts b/packages/next/lib/resolve-request.ts
@@ -1,18 +1,10 @@
-import resolve from 'next/dist/compiled/resolve/index.js'
+import resolve from 'resolve'
 import path from 'path'
 
 export function resolveRequest(req: string, issuer: string): string {
-  // The `resolve` package is prebuilt through ncc, which prevents
-  // PnP from being able to inject itself into it. To circumvent
-  // this, we simply use PnP directly when available.
-  if (process.versions.pnp) {
-    const { resolveRequest: pnpResolveRequest } = require(`pnpapi`)
-    return pnpResolveRequest(req, issuer, { considerBuiltins: false })
-  } else {
-    const basedir =
-      issuer.endsWith(path.posix.sep) || issuer.endsWith(path.win32.sep)
-        ? issuer
-        : path.dirname(issuer)
-    return resolve.sync(req, { basedir })
-  }
+  const basedir =
+    issuer.endsWith(path.posix.sep) || issuer.endsWith(path.win32.sep)
+      ? issuer
+      : path.dirname(issuer)
+  return resolve.sync(req, { basedir })
 }
diff --git a/packages/next/types/misc.d.ts b/packages/next/types/misc.d.ts
@@ -146,10 +146,6 @@ declare module 'next/dist/compiled/recast' {
   import m from 'recast'
   export = m
 }
-declare module 'next/dist/compiled/resolve/index.js' {
-  import m from 'resolve'
-  export = m
-}
 declare module 'next/dist/compiled/send' {
   import m from 'send'
   export = m