From cf4d59378355e0633cd942ed9737fe52ecd7a0cf Mon Sep 17 00:00:00 2001
From: pooya parsa <pyapar@gmail.com>
Date: Sat, 2 Oct 2021 18:01:17 +0200
Subject: [PATCH] feat: use native esm for all packages (#539)

---
 src/build.config.ts                   |  1 +
 src/build.ts                          | 10 +++++-----
 src/compat.js                         |  3 ---
 src/context.ts                        |  6 +++---
 src/dirs.ts                           |  6 ++++++
 src/package.json                      |  8 ++++----
 src/presets/azure_functions.ts        |  2 +-
 src/presets/browser.ts                | 10 +++++-----
 src/presets/firebase.ts               | 15 +++++++++------
 src/presets/netlify.ts                |  6 +++---
 src/rollup/config.ts                  | 15 +++++++++------
 src/rollup/plugins/dynamic-require.ts | 16 +++++++++-------
 src/rollup/plugins/externals.ts       |  6 +++---
 src/rollup/plugins/static.ts          |  2 +-
 src/rollup/plugins/virtual.ts         |  6 +++---
 src/runtime/entries/firebase.ts       |  4 ++--
 src/server/dev.ts                     | 12 ++++++------
 src/utils/index.ts                    |  8 ++++----
 src/utils/tree.ts                     |  4 ++--
 19 files changed, 76 insertions(+), 64 deletions(-)
 delete mode 100644 src/compat.js
 create mode 100644 src/dirs.ts

diff --git a/src/build.config.ts b/src/build.config.ts
index 8f682d7fc7..e3760c2383 100644
--- a/src/build.config.ts
+++ b/src/build.config.ts
@@ -2,6 +2,7 @@ import { defineBuildConfig } from 'unbuild'
 
 export default defineBuildConfig({
   declaration: true,
+  emitCJS: false,
   entries: [
     'src/index',
     { input: 'src/runtime/', outDir: 'dist/runtime', format: 'esm' },
diff --git a/src/build.ts b/src/build.ts
index e3e8b9237e..f4dc5aba4e 100644
--- a/src/build.ts
+++ b/src/build.ts
@@ -1,7 +1,7 @@
 import { resolve, join } from 'pathe'
 import consola from 'consola'
 import { rollup, watch as rollupWatch } from 'rollup'
-import { readFile, emptyDir, copy } from 'fs-extra'
+import fse from 'fs-extra'
 import { printFSTree } from './utils/tree'
 import { getRollupConfig } from './rollup/config'
 import { hl, prettyPath, serializeTemplate, writeFile, isDirectory } from './utils'
@@ -24,7 +24,7 @@ export async function prepare (nitroContext: NitroContext) {
 
 async function cleanupDir (dir: string) {
   consola.info('Cleaning up', prettyPath(dir))
-  await emptyDir(dir)
+  await fse.emptyDir(dir)
 }
 
 export async function generate (nitroContext: NitroContext) {
@@ -32,12 +32,12 @@ export async function generate (nitroContext: NitroContext) {
 
   const clientDist = resolve(nitroContext._nuxt.buildDir, 'dist/client')
   if (await isDirectory(clientDist)) {
-    await copy(clientDist, join(nitroContext.output.publicDir, nitroContext._nuxt.publicPath))
+    await fse.copy(clientDist, join(nitroContext.output.publicDir, nitroContext._nuxt.publicPath))
   }
 
   const publicDir = nitroContext._nuxt.publicDir
   if (await isDirectory(publicDir)) {
-    await copy(publicDir, nitroContext.output.publicDir)
+    await fse.copy(publicDir, nitroContext.output.publicDir)
   }
 
   consola.success('Generated public ' + prettyPath(nitroContext.output.publicDir))
@@ -48,7 +48,7 @@ export async function build (nitroContext: NitroContext) {
   const htmlSrc = resolve(nitroContext._nuxt.buildDir, `views/${{ 2: 'app', 3: 'document' }[2]}.template.html`)
   const htmlTemplate = { src: htmlSrc, contents: '', dst: '', compiled: '' }
   htmlTemplate.dst = htmlTemplate.src.replace(/.html$/, '.mjs').replace('app.', 'document.')
-  htmlTemplate.contents = nitroContext.vfs[htmlTemplate.src] || await readFile(htmlTemplate.src, 'utf-8')
+  htmlTemplate.contents = nitroContext.vfs[htmlTemplate.src] || await fse.readFile(htmlTemplate.src, 'utf-8')
   await nitroContext._internal.hooks.callHook('nitro:document', htmlTemplate)
   htmlTemplate.compiled = 'export default ' + serializeTemplate(htmlTemplate.contents)
   await writeFile(htmlTemplate.dst, htmlTemplate.compiled)
diff --git a/src/compat.js b/src/compat.js
deleted file mode 100644
index d3c92d80e2..0000000000
--- a/src/compat.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function () {
-  throw new Error('Nitro compat for nuxt2 moved to nuxt bridge. Please check documentation for more details.')
-}
diff --git a/src/context.ts b/src/context.ts
index 0b0372b84a..047b128153 100644
--- a/src/context.ts
+++ b/src/context.ts
@@ -1,6 +1,5 @@
 /* eslint-disable no-use-before-define */
-
-import { resolve, dirname } from 'pathe'
+import { resolve } from 'pathe'
 import defu from 'defu'
 import { createHooks, Hookable, NestedHooks } from 'hookable'
 import type { Preset } from 'unenv'
@@ -13,6 +12,7 @@ import type { AssetOptions } from './rollup/plugins/assets'
 import type { ServerMiddleware } from './server/middleware'
 import type { RollupConfig } from './rollup/config'
 import type { Options as EsbuildOptions } from './rollup/plugins/esbuild'
+import { runtimeDir } from './dirs'
 
 export interface NitroHooks {
   'nitro:document': (htmlTemplate: { src: string, contents: string, dst: string, compiled: string }) => void
@@ -136,7 +136,7 @@ export function getNitroContext (nuxtOptions: NuxtOptions, input: NitroInput): N
       }
     },
     _internal: {
-      runtimeDir: resolve(dirname(require.resolve('@nuxt/nitro')), 'runtime'),
+      runtimeDir,
       hooks: createHooks<NitroHooks>()
     }
   }
diff --git a/src/dirs.ts b/src/dirs.ts
new file mode 100644
index 0000000000..bf63260976
--- /dev/null
+++ b/src/dirs.ts
@@ -0,0 +1,6 @@
+import { fileURLToPath } from 'url'
+import { dirname, resolve } from 'pathe'
+
+export const distDir = dirname(fileURLToPath(import.meta.url))
+export const pkgDir = resolve(distDir, '..')
+export const runtimeDir = resolve(distDir, 'runtime')
diff --git a/src/package.json b/src/package.json
index f9f3d2e562..b35d707285 100644
--- a/src/package.json
+++ b/src/package.json
@@ -2,12 +2,12 @@
   "name": "@nuxt/nitro",
   "version": "0.10.0",
   "license": "MIT",
-  "main": "./dist/index.cjs",
+  "type": "module",
+  "exports": "./dist/index.mjs",
   "types": "./types/index.d.ts",
   "files": [
     "dist",
-    "types",
-    "compat.js"
+    "types"
   ],
   "scripts": {
     "prepack": "unbuild"
@@ -50,6 +50,7 @@
     "jiti": "^1.12.6",
     "listhen": "^0.2.4",
     "mime": "^2.5.2",
+    "mlly": "^0.2.2",
     "node-fetch": "^3.0.0",
     "ohmyfetch": "^0.3.1",
     "ora": "^6.0.1",
@@ -65,7 +66,6 @@
     "ufo": "^0.7.9",
     "unenv": "^0.3.10",
     "unstorage": "^0.2.8",
-    "upath": "^2.0.1",
     "vue": "3.2.19",
     "vue-bundle-renderer": "^0.3.1",
     "vue-server-renderer": "^2.6.14"
diff --git a/src/presets/azure_functions.ts b/src/presets/azure_functions.ts
index 07d274a85e..a1c8df208e 100644
--- a/src/presets/azure_functions.ts
+++ b/src/presets/azure_functions.ts
@@ -1,6 +1,6 @@
+import { createWriteStream } from 'fs'
 import archiver from 'archiver'
 import consola from 'consola'
-import { createWriteStream } from 'fs-extra'
 import { join, resolve } from 'pathe'
 import { prettyPath, writeFile } from '../utils'
 import { NitroPreset, NitroContext } from '../context'
diff --git a/src/presets/browser.ts b/src/presets/browser.ts
index 084bd13acf..f174c9e792 100644
--- a/src/presets/browser.ts
+++ b/src/presets/browser.ts
@@ -1,4 +1,4 @@
-import { existsSync, writeFile } from 'fs-extra'
+import { existsSync, promises as fsp } from 'fs'
 import { resolve } from 'pathe'
 import consola from 'consola'
 import { extendPreset, prettyPath } from '../utils'
@@ -62,17 +62,17 @@ if ('serviceWorker' in navigator) {
         tmpl.compiled = tmpl.compiled.replace('</body>', script + '</body>')
       },
       async 'nitro:compiled' ({ output }: NitroContext) {
-        await writeFile(resolve(output.publicDir, 'sw.js'), `self.importScripts('${input._nuxt.routerBase}_server/index.mjs');`)
+        await fsp.writeFile(resolve(output.publicDir, 'sw.js'), `self.importScripts('${input._nuxt.routerBase}_server/index.mjs');`, 'utf8')
 
         // Temp fix
         if (!existsSync(resolve(output.publicDir, 'index.html'))) {
-          await writeFile(resolve(output.publicDir, 'index.html'), html)
+          await fsp.writeFile(resolve(output.publicDir, 'index.html'), html, 'utf8')
         }
         if (!existsSync(resolve(output.publicDir, '200.html'))) {
-          await writeFile(resolve(output.publicDir, '200.html'), html)
+          await fsp.writeFile(resolve(output.publicDir, '200.html'), html, 'utf8')
         }
         if (!existsSync(resolve(output.publicDir, '404.html'))) {
-          await writeFile(resolve(output.publicDir, '404.html'), html)
+          await fsp.writeFile(resolve(output.publicDir, '404.html'), html, 'utf8')
         }
         consola.info('Ready to deploy to static hosting:', prettyPath(output.publicDir as string))
       }
diff --git a/src/presets/firebase.ts b/src/presets/firebase.ts
index bcceb3b7e6..25d5aaf4bd 100644
--- a/src/presets/firebase.ts
+++ b/src/presets/firebase.ts
@@ -1,5 +1,6 @@
+import { createRequire } from 'module'
 import { join, relative, resolve } from 'pathe'
-import { existsSync, readJSONSync } from 'fs-extra'
+import fse from 'fs-extra'
 import consola from 'consola'
 import globby from 'globby'
 
@@ -16,7 +17,7 @@ export const firebase: NitroPreset = {
 }
 
 async function writeRoutes ({ output: { publicDir, serverDir }, _nuxt: { rootDir } }: NitroContext) {
-  if (!existsSync(join(rootDir, 'firebase.json'))) {
+  if (!fse.existsSync(join(rootDir, 'firebase.json'))) {
     const firebase = {
       functions: {
         source: relative(rootDir, serverDir)
@@ -38,20 +39,22 @@ async function writeRoutes ({ output: { publicDir, serverDir }, _nuxt: { rootDir
     await writeFile(resolve(rootDir, 'firebase.json'), JSON.stringify(firebase))
   }
 
+  const _require = createRequire(import.meta.url)
+
   const jsons = await globby(`${serverDir}/node_modules/**/package.json`)
   const prefixLength = `${serverDir}/node_modules/`.length
   const suffixLength = '/package.json'.length
   const dependencies = jsons.reduce((obj, packageJson) => {
     const dirname = packageJson.slice(prefixLength, -suffixLength)
     if (!dirname.includes('node_modules')) {
-      obj[dirname] = require(packageJson).version
+      obj[dirname] = _require(packageJson).version
     }
     return obj
   }, {} as Record<string, string>)
 
   let nodeVersion = '12'
   try {
-    const currentNodeVersion = readJSONSync(join(rootDir, 'package.json')).engines.node
+    const currentNodeVersion = fse.readJSONSync(join(rootDir, 'package.json')).engines.node
     if (['12', '10'].includes(currentNodeVersion)) {
       nodeVersion = currentNodeVersion
     }
@@ -66,8 +69,8 @@ async function writeRoutes ({ output: { publicDir, serverDir }, _nuxt: { rootDir
         dependencies,
         devDependencies: {
           'firebase-functions-test': 'latest',
-          'firebase-admin': require('firebase-admin/package.json').version,
-          'firebase-functions': require('firebase-functions/package.json')
+          'firebase-admin': _require('firebase-admin/package.json').version,
+          'firebase-functions': _require('firebase-functions/package.json')
             .version
         },
         engines: { node: nodeVersion }
diff --git a/src/presets/netlify.ts b/src/presets/netlify.ts
index 0e308d7c8c..0e4059b7d5 100644
--- a/src/presets/netlify.ts
+++ b/src/presets/netlify.ts
@@ -1,5 +1,5 @@
+import { existsSync, promises as fsp } from 'fs'
 import { join } from 'pathe'
-import { existsSync, readFile, writeFile } from 'fs-extra'
 import consola from 'consola'
 import { extendPreset } from '../utils'
 import { NitroContext, NitroPreset } from '../context'
@@ -15,7 +15,7 @@ export const netlify: NitroPreset = extendPreset(lambda, {
       const redirectsPath = join(ctx.output.publicDir, '_redirects')
       let contents = '/* /.netlify/functions/server 200'
       if (existsSync(redirectsPath)) {
-        const currentRedirects = await readFile(redirectsPath, 'utf-8')
+        const currentRedirects = await fsp.readFile(redirectsPath, 'utf-8')
         if (currentRedirects.match(/^\/\* /m)) {
           consola.info('Not adding Nitro fallback to `_redirects` (as an existing fallback was found).')
           return
@@ -23,7 +23,7 @@ export const netlify: NitroPreset = extendPreset(lambda, {
         consola.info('Adding Nitro fallback to `_redirects` to handle all unmatched routes.')
         contents = currentRedirects + '\n' + contents
       }
-      await writeFile(redirectsPath, contents)
+      await fsp.writeFile(redirectsPath, contents)
     },
     'nitro:rollup:before' (ctx: NitroContext) {
       ctx.rollupConfig.output.entryFileNames = 'server.ts'
diff --git a/src/rollup/config.ts b/src/rollup/config.ts
index 9e654fd87a..ab774f0464 100644
--- a/src/rollup/config.ts
+++ b/src/rollup/config.ts
@@ -1,5 +1,6 @@
 import { pathToFileURL } from 'url'
-import { dirname, join, normalize, relative, resolve } from 'pathe'
+import { createRequire } from 'module'
+import { dirname, join, relative, resolve } from 'pathe'
 import type { InputOptions, OutputOptions } from 'rollup'
 import defu from 'defu'
 import { terser } from 'rollup-plugin-terser'
@@ -15,7 +16,8 @@ import * as unenv from 'unenv'
 
 import type { Preset } from 'unenv'
 import { NitroContext } from '../context'
-import { resolvePath, MODULE_DIR } from '../utils'
+import { resolvePath } from '../utils'
+import { pkgDir } from '../dirs'
 
 import { dynamicRequire } from './plugins/dynamic-require'
 import { externals } from './plugins/externals'
@@ -63,10 +65,11 @@ export const getRollupConfig = (nitroContext: NitroContext) => {
   }
 
   // TODO: #590
+  const _require = createRequire(import.meta.url)
   if (nitroContext._nuxt.majorVersion === 3) {
     env.alias['vue/server-renderer'] = 'vue/server-renderer'
     env.alias['vue/compiler-sfc'] = 'vue/compiler-sfc'
-    env.alias.vue = require.resolve(`vue/dist/vue.cjs${nitroContext._nuxt.dev ? '' : '.prod'}.js`)
+    env.alias.vue = _require.resolve(`vue/dist/vue.cjs${nitroContext._nuxt.dev ? '' : '.prod'}.js`)
   }
 
   const buildServerDir = join(nitroContext._nuxt.buildDir, 'dist/server')
@@ -216,8 +219,8 @@ export const getRollupConfig = (nitroContext: NitroContext) => {
   rollupConfig.plugins.push(alias({
     entries: {
       '#nitro': nitroContext._internal.runtimeDir,
-      '#nitro-renderer': normalize(require.resolve(resolve(nitroContext._internal.runtimeDir, 'app', renderer))),
-      '#config': normalize(require.resolve(resolve(nitroContext._internal.runtimeDir, 'app/config'))),
+      '#nitro-renderer': resolve(nitroContext._internal.runtimeDir, 'app', renderer),
+      '#config': resolve(nitroContext._internal.runtimeDir, 'app/config'),
       '#nitro-vue-renderer': vue2ServerRenderer,
       // Only file and data URLs are supported by the default ESM loader on Windows (#427)
       '#build': nitroContext._nuxt.dev && process.platform === 'win32'
@@ -234,7 +237,7 @@ export const getRollupConfig = (nitroContext: NitroContext) => {
   const moduleDirectories = [
     resolve(nitroContext._nuxt.rootDir, 'node_modules'),
     ...nitroContext._nuxt.modulesDir,
-    resolve(MODULE_DIR, '../node_modules'),
+    resolve(pkgDir, '../node_modules'),
     'node_modules'
   ]
 
diff --git a/src/rollup/plugins/dynamic-require.ts b/src/rollup/plugins/dynamic-require.ts
index fa7951d096..35a5376cc0 100644
--- a/src/rollup/plugins/dynamic-require.ts
+++ b/src/rollup/plugins/dynamic-require.ts
@@ -1,10 +1,11 @@
+import { pathToFileURL } from 'url'
 import { resolve } from 'pathe'
 import globby from 'globby'
 import type { Plugin } from 'rollup'
 import { serializeImportName } from '../../utils'
 
 const PLUGIN_NAME = 'dynamic-require'
-const HELPER_DYNAMIC = `\0${PLUGIN_NAME}.js`
+const HELPER_DYNAMIC = `\0${PLUGIN_NAME}.mjs`
 const DYNAMIC_REQUIRE_RE = /import\("\.\/" ?\+(.*)\).then/g
 
 interface Options {
@@ -57,24 +58,25 @@ export function dynamicRequire ({ dir, ignore, inline }: Options): Plugin {
       let files = []
       try {
         const wpManifest = resolve(dir, './server.manifest.json')
-        files = await import(wpManifest).then(r => Object.keys(r.files).filter(file => !ignore.includes(file)))
+        files = await import(pathToFileURL(wpManifest).href).then(r => Object.keys(r.files).filter(file => !ignore.includes(file)))
       } catch {
         files = await globby('**/*.{cjs,mjs,js}', { cwd: dir, absolute: false, ignore })
       }
-      const chunks = files.map(id => ({
+
+      const chunks = (await Promise.all(files.map(async id => ({
         id,
         src: resolve(dir, id).replace(/\\/g, '/'),
         name: serializeImportName(id),
-        meta: getWebpackChunkMeta(resolve(dir, id))
-      })).filter(chunk => chunk.meta)
+        meta: await getWebpackChunkMeta(resolve(dir, id))
+      })))).filter(chunk => chunk.meta)
 
       return inline ? TMPL_INLINE({ chunks }) : TMPL_LAZY({ chunks })
     }
   }
 }
 
-function getWebpackChunkMeta (src: string) {
-  const chunk = require(src) || {}
+async function getWebpackChunkMeta (src: string) {
+  const chunk = await import(pathToFileURL(src).href).then(r => r.default || r || {})
   const { id, ids, modules } = chunk
   if (!id && !ids) {
     return null // Not a webpack chunk
diff --git a/src/rollup/plugins/externals.ts b/src/rollup/plugins/externals.ts
index 3210dd1155..3855a51b3a 100644
--- a/src/rollup/plugins/externals.ts
+++ b/src/rollup/plugins/externals.ts
@@ -1,5 +1,5 @@
 import { resolve, dirname } from 'pathe'
-import { copyFile, mkdirp } from 'fs-extra'
+import fse from 'fs-extra'
 import { nodeFileTrace, NodeFileTraceOptions } from '@vercel/nft'
 import type { Plugin } from 'rollup'
 
@@ -84,8 +84,8 @@ export function externals (opts: NodeExternalsOptions): Plugin {
         const writeFile = async (file) => {
           const src = resolve(opts.traceOptions.base, file)
           const dst = resolve(opts.outDir, 'node_modules', file.split('node_modules/').pop())
-          await mkdirp(dirname(dst))
-          await copyFile(src, dst)
+          await fse.mkdirp(dirname(dst))
+          await fse.copyFile(src, dst)
         }
         if (process.platform === 'win32') {
           // Workaround for EBUSY on windows (#424)
diff --git a/src/rollup/plugins/static.ts b/src/rollup/plugins/static.ts
index c259833b45..e4f9ccd4ca 100644
--- a/src/rollup/plugins/static.ts
+++ b/src/rollup/plugins/static.ts
@@ -1,5 +1,5 @@
+import { readFileSync, statSync } from 'fs'
 import createEtag from 'etag'
-import { readFileSync, statSync } from 'fs-extra'
 import mime from 'mime'
 import { relative, resolve } from 'pathe'
 import virtual from '@rollup/plugin-virtual'
diff --git a/src/rollup/plugins/virtual.ts b/src/rollup/plugins/virtual.ts
index bc919e8cb6..cd1c8ee0a8 100644
--- a/src/rollup/plugins/virtual.ts
+++ b/src/rollup/plugins/virtual.ts
@@ -1,4 +1,4 @@
-import * as path from 'pathe'
+import { resolve, dirname } from 'pathe'
 import type { Plugin } from 'rollup'
 
 // Based on https://github.com/rollup/plugins/blob/master/packages/virtual/src/index.ts
@@ -16,7 +16,7 @@ export default function virtual (modules: RollupVirtualOptions): Plugin {
 
   for (const [id, mod] of Object.entries(modules)) {
     _modules.set(id, mod)
-    _modules.set(path.resolve(id), mod)
+    _modules.set(resolve(id), mod)
   }
 
   return {
@@ -29,7 +29,7 @@ export default function virtual (modules: RollupVirtualOptions): Plugin {
         const importerNoPrefix = importer.startsWith(PREFIX)
           ? importer.slice(PREFIX.length)
           : importer
-        const resolved = path.resolve(path.dirname(importerNoPrefix), id)
+        const resolved = resolve(dirname(importerNoPrefix), id)
         if (_modules.has(resolved)) { return PREFIX + resolved }
       }
 
diff --git a/src/runtime/entries/firebase.ts b/src/runtime/entries/firebase.ts
index 162fa04071..b8dfd55c34 100644
--- a/src/runtime/entries/firebase.ts
+++ b/src/runtime/entries/firebase.ts
@@ -1,7 +1,7 @@
 import '#polyfill'
 
+// @ts-ignore
+import functions from 'firebase-functions'
 import { handle } from '../server'
 
-const functions = require('firebase-functions')
-
 export const server = functions.https.onRequest(handle)
diff --git a/src/server/dev.ts b/src/server/dev.ts
index 3e261c1b37..3beed262d4 100644
--- a/src/server/dev.ts
+++ b/src/server/dev.ts
@@ -1,17 +1,17 @@
 import { Worker } from 'worker_threads'
 
 import { IncomingMessage, ServerResponse } from 'http'
+import { promises as fsp } from 'fs'
 import { loading as loadingTemplate } from '@nuxt/design'
 import chokidar, { FSWatcher } from 'chokidar'
 import debounce from 'debounce'
-import { stat } from 'fs-extra'
 import { promisifyHandle, createApp, Middleware, useBase } from 'h3'
-import { createProxy } from 'http-proxy'
+import httpProxy from 'http-proxy'
 import { listen, Listener, ListenOptions } from 'listhen'
 import servePlaceholder from 'serve-placeholder'
 import serveStatic from 'serve-static'
 import { resolve } from 'pathe'
-import type { Server } from 'connect'
+import connect from 'connect'
 import type { NitroContext } from '../context'
 import { handleVfs } from './vfs'
 
@@ -27,7 +27,7 @@ export function createDevServer (nitroContext: NitroContext) {
       workerAddress = null
       pendingWorker = null
     }
-    if (!(await stat(workerEntry)).isFile) {
+    if (!(await fsp.stat(workerEntry)).isFile) {
       throw new Error('Entry not found: ' + workerEntry)
     }
     return new Promise((resolve, reject) => {
@@ -72,7 +72,7 @@ export function createDevServer (nitroContext: NitroContext) {
   app.use(nitroContext._nuxt.publicPath, servePlaceholder())
 
   // SSR Proxy
-  const proxy = createProxy()
+  const proxy = httpProxy.createProxy()
   const proxyHandle = promisifyHandle((req: IncomingMessage, res: ServerResponse) => proxy.web(req, res, { target: workerAddress }, (_err: unknown) => {
     // console.error('[proxy]', err)
   }))
@@ -151,7 +151,7 @@ function createDynamicMiddleware (): DynamicMiddleware {
         middleware = input
         return
       }
-      const app: Server = require('connect')()
+      const app = connect()
       for (const m of input) {
         app.use(m.path || m.route || '/', m.handler || m.handle!)
       }
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 22dacb264a..997f363e66 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,3 +1,4 @@
+import { createRequire } from 'module'
 import { relative, dirname, resolve } from 'pathe'
 import fse from 'fs-extra'
 import jiti from 'jiti'
@@ -8,8 +9,6 @@ import chalk from 'chalk'
 import { get } from 'dot-prop'
 import type { NitroPreset, NitroInput } from '../context'
 
-export const MODULE_DIR = resolve(__dirname, '..')
-
 export function hl (str: string) {
   return chalk.cyan(str)
 }
@@ -35,7 +34,7 @@ export function serializeTemplate (contents: string) {
 }
 
 export function jitiImport (dir: string, path: string) {
-  return jiti(dir)(path)
+  return jiti(dir, { interopDefault: true })(path)
 }
 
 export function tryImport (dir: string, path: string) {
@@ -107,9 +106,10 @@ const _getDependenciesMode = {
   prod: ['dependencies'],
   all: ['devDependencies', 'dependencies']
 }
+const _require = createRequire(import.meta.url)
 export function getDependencies (dir: string, mode: keyof typeof _getDependenciesMode = 'all') {
   const fields = _getDependenciesMode[mode]
-  const pkg = require(resolve(dir, 'package.json'))
+  const pkg = _require(resolve(dir, 'package.json'))
   const dependencies = []
   for (const field of fields) {
     if (pkg[field]) {
diff --git a/src/utils/tree.ts b/src/utils/tree.ts
index 175569beb6..72ba7e4fb0 100644
--- a/src/utils/tree.ts
+++ b/src/utils/tree.ts
@@ -1,8 +1,8 @@
+import { promises as fsp } from 'fs'
 import { resolve, dirname, relative } from 'pathe'
 import globby from 'globby'
 import prettyBytes from 'pretty-bytes'
 import gzipSize from 'gzip-size'
-import { readFile } from 'fs-extra'
 import chalk from 'chalk'
 import stdenv from 'std-env'
 
@@ -15,7 +15,7 @@ export async function printFSTree (dir: string) {
 
   const items = (await Promise.all(files.map(async (file) => {
     const path = resolve(dir, file)
-    const src = await readFile(path)
+    const src = await fsp.readFile(path)
     const size = src.byteLength
     const gzip = await gzipSize(src)
     return { file, path, size, gzip }