@monkeyplus/flow 5.0.0-rc.2 → 5.0.0-rc.200

package/dist/index.mjs

@@ -1,36 +1,33 @@
 import { createHooks } from 'hookable';
 import { dirname, resolve, normalize, join, isAbsolute, relative, extname } from 'pathe';
-import { defineFlowModule, addPlugin, defineNuxtModule, logger, addTemplate, addPluginTemplate, addVitePlugin, useNuxt, resolveAlias, resolveFilesFlow, nuxtCtx, installModule, loadFlowConfig, templateUtils, normalizeTemplate, compileTemplate, normalizePlugin, isIgnoredFlow } from '@monkeyplus/flow-kit';
+import { defineFlowModule, addPlugin, defineNuxtModule, logger, addTemplate, addPluginTemplate, addVitePlugin, addWebpackPlugin, updateTemplates, useNuxt, resolveAlias, resolveFilesFlow, nuxtCtx, installModule, loadFlowConfig, normalizeTemplate, compileTemplate, normalizePlugin, findPath, templateUtils, isIgnoredFlow } from '@monkeyplus/flow-kit';
+import escapeRE from 'escape-string-regexp';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { defineUnimportPreset, createUnimport, toImports, scanDirExports } from 'unimport';
+import defu from 'defu';
 import { createUnplugin } from 'unplugin';
-import { parseURL, parseQuery, joinURL, withoutTrailingSlash } from 'ufo';
-import escapeRE from 'escape-string-regexp';
+import { parseURL, parseQuery, joinURL } from 'ufo';
+import fs from 'fs';
 import { camelCase, pascalCase } from 'scule';
-import { genImport, genDynamicImport, genArrayFromRaw, genString, genObjectFromRawEntries } from 'knitwork';
-import fse from 'fs-extra';
-import logger$1 from 'consola';
-import * as vite from 'vite';
-import { createServer, build as build$1 } from 'vite';
-import { debounce } from 'perfect-debounce';
-import { existsSync, promises, readdirSync, statSync } from 'node:fs';
-import { createNitro, scanHandlers, writeTypes, build as build$2, prepare, copyPublicAssets, prerender, createDevServer } from 'nitropack';
-import defu from 'defu';
-import { dynamicEventHandler, toEventHandler } from 'h3';
-import { createRequire, builtinModules } from 'node:module';
+import { genImport, genDynamicImport, genSafeVariableName, genArrayFromRaw, genString } from 'knitwork';
+import { existsSync, promises } from 'node:fs';
+import { createNitro, scanHandlers, writeTypes, build as build$1, prepare, copyPublicAssets, prerender, createDevServer } from 'nitropack';
+import { dynamicEventHandler } from 'h3';
+import { createRequire } from 'node:module';
 import chokidar from 'chokidar';
+import { debounce } from 'perfect-debounce';
 import { generateTypes, resolveSchema } from 'untyped';
-import { getPort } from 'get-port-please';
-import { sanitizeFilePath } from 'mlly';
+import { hash } from 'ohash';
+import { resolvePath, sanitizeFilePath } from 'mlly';
+import * as vite from 'vite';
 import replace from '@rollup/plugin-replace';
-import { isExternal as isExternal$1, ExternalsDefaults } from 'externality';
-import { createHash } from 'node:crypto';
-import MagicString from 'magic-string';
+import { resolveTSConfig } from 'pkg-types';
+import fse from 'fs-extra';
 
-const version = "5.0.0-rc.2";
+const version = "5.0.0-rc.200";
 
 let _distDir = dirname(fileURLToPath(import.meta.url));
-if (_distDir.endsWith("chunks"))
+if (_distDir.match(/(chunks|shared)$/))
   _distDir = dirname(_distDir);
 const distDir = _distDir;
 const pkgDir = resolve(distDir, "..");
@@ -53,40 +50,51 @@ const metaModule = defineFlowModule({
 
 const TransformPlugin = createUnplugin(({ ctx, options, sourcemap }) => {
   return {
-    name: "flow:auto-imports-transform",
+    name: "nuxt:imports-transform",
     enforce: "post",
     transformInclude(id) {
       const { pathname, search } = parseURL(decodeURIComponent(pathToFileURL(id).href));
-      const { type, macro } = parseQuery(search);
-      const exclude = options.transform?.exclude || [/[\\/]node_modules[\\/]/];
-      const include = options.transform?.include || [];
-      if (exclude.some((pattern) => id.match(pattern)))
-        return false;
-      if (include.some((pattern) => id.match(pattern)))
+      const query = parseQuery(search);
+      if (options.transform?.include?.some((pattern) => id.match(pattern)))
         return true;
-      if (pathname.endsWith(".vue") && (type === "template" || type === "script" || macro || !search))
+      if (options.transform?.exclude?.some((pattern) => id.match(pattern)))
+        return false;
+      if (id.endsWith(".vue") || "macro" in query || "vue" in query && (query.type === "template" || query.type === "script" || "setup" in query))
         return true;
       if (pathname.match(/\.((c|m)?j|t)sx?$/g))
         return true;
     },
-    async transform(_code, id) {
-      const { code, s } = await ctx.injectImports(_code);
-      if (code === _code)
+    async transform(code, id) {
+      id = normalize(id);
+      const isNodeModule = id.match(/[\\/]node_modules[\\/]/) && !options.transform?.include?.some((pattern) => id.match(pattern));
+      if (isNodeModule && !code.match(/(['"])#imports\1/))
         return;
-      return {
-        code,
-        map: sourcemap && s.generateMap({ source: id, includeContent: true })
-      };
+      const { s } = await ctx.injectImports(code, id, { autoImport: options.autoImport && !isNodeModule });
+      if (s.hasChanged()) {
+        return {
+          code: s.toString(),
+          map: sourcemap ? s.generateMap({ source: id, includeContent: true }) : void 0
+        };
+      }
     }
   };
 });
 
 const commonPresets = [
+  // #head
   defineUnimportPreset({
     from: "#head",
     imports: [
       "useHead"
     ]
+  }),
+  defineUnimportPreset({
+    from: "#_pages",
+    imports: [
+      "definePage",
+      "defineDynamicPage",
+      "defineSharedContext"
+    ]
   })
 ];
 const appPreset = defineUnimportPreset({
@@ -104,10 +112,12 @@ const appPreset = defineUnimportPreset({
 const vuePreset = defineUnimportPreset({
   from: "vue",
   imports: [
+    // Components
     "defineComponent",
     "getCurrentInstance",
     "useSlots",
     "h",
+    // Reactivity
     "computed"
   ]
 });
@@ -117,50 +127,65 @@ const defaultPresets = [
   vuePreset
 ];
 
-const autoImportsModule = defineNuxtModule({
+const importsModule = defineNuxtModule({
   meta: {
-    name: "auto-imports",
-    configKey: "autoImports"
+    name: "imports",
+    configKey: "imports"
   },
   defaults: {
+    autoImport: true,
     presets: defaultPresets,
     global: false,
     imports: [],
     dirs: [],
     transform: {
+      include: [],
       exclude: void 0
     }
   },
-  async setup(options, flow) {
-    await flow.callHook("autoImports:sources", options.presets);
-    options.presets.forEach((i) => {
+  async setup(options, nuxt) {
+    if (nuxt.options.autoImports) {
+      logger.warn("`autoImports` config is deprecated, use `imports` instead.");
+      options = defu(nuxt.options.autoImports, options);
+    }
+    await nuxt.callHook("imports:sources", options.presets);
+    options.presets?.forEach((_i) => {
+      const i = _i;
       if (typeof i !== "string" && i.names && !i.imports) {
         i.imports = i.names;
-        logger.warn("auto-imports: presets.names is deprecated, use presets.imports instead");
+        logger.warn("imports: presets.names is deprecated, use presets.imports instead");
       }
     });
     const ctx = createUnimport({
       presets: options.presets,
-      imports: options.imports
+      imports: options.imports,
+      virtualImports: ["#imports"],
+      addons: {
+        vueTemplate: options.autoImport
+      }
     });
     let composablesDirs = [];
-    for (const layer of flow.options._layers) {
+    for (const layer of nuxt.options._layers) {
       composablesDirs.push(resolve(layer.config.srcDir, "composables"));
-      for (const dir of layer.config.autoImports?.dirs ?? [])
+      for (const dir of layer.config.imports?.dirs ?? []) {
+        if (!dir)
+          continue;
         composablesDirs.push(resolve(layer.config.srcDir, dir));
+      }
     }
-    await flow.callHook("autoImports:dirs", composablesDirs);
+    await nuxt.callHook("imports:dirs", composablesDirs);
     composablesDirs = composablesDirs.map((dir) => normalize(dir));
     addTemplate({
       filename: "imports.mjs",
-      getContents: () => ctx.toExports()
+      getContents: async () => `${await ctx.toExports()}
+if (process.dev) { console.warn("[nuxt] \`#imports\` should be transformed with real imports. There seems to be something wrong with the imports plugin.") }`
     });
-    flow.options.alias["#imports"] = join(flow.options.buildDir, "imports");
-    if (flow.options.dev && options.global) {
+    nuxt.options.alias["#imports"] = join(nuxt.options.buildDir, "imports");
+    if (nuxt.options.dev && options.global) {
       addPluginTemplate({
-        filename: "auto-imports.mjs",
-        getContents: () => {
-          const imports = ctx.getImports();
+        filename: "imports.mjs",
+        getContents: async () => {
+          const imports = await ctx.getImports();
           const importStatement = toImports(imports);
           const globalThisSet = imports.map((i) => `globalThis.${i.as} = ${i.as};`).join("\n");
           return `${importStatement}
@@ -171,32 +196,41 @@ export default () => {};`;
         }
       });
     } else {
-      addVitePlugin(TransformPlugin.vite({ ctx, options, sourcemap: flow.options.sourcemap }));
+      addVitePlugin(TransformPlugin.vite({ ctx, options, sourcemap: nuxt.options.sourcemap.server || nuxt.options.sourcemap.client }));
+      addWebpackPlugin(TransformPlugin.webpack({ ctx, options, sourcemap: nuxt.options.sourcemap.server || nuxt.options.sourcemap.client }));
     }
-    const regenerateAutoImports = async () => {
+    const regenerateImports = async () => {
       ctx.clearDynamicImports();
       await ctx.modifyDynamicImports(async (imports) => {
         imports.push(...await scanDirExports(composablesDirs));
-        await flow.callHook("autoImports:extend", imports);
+        await nuxt.callHook("imports:extend", imports);
       });
     };
-    await regenerateAutoImports();
-    addDeclarationTemplates(ctx);
-    flow.hook("prepare:types", ({ references }) => {
-      references.push({ path: resolve(flow.options.buildDir, "types/auto-imports.d.ts") });
-      references.push({ path: resolve(flow.options.buildDir, "imports.d.ts") });
+    await regenerateImports();
+    addDeclarationTemplates(ctx, options);
+    nuxt.hook("prepare:types", ({ references }) => {
+      references.push({ path: resolve(nuxt.options.buildDir, "types/imports.d.ts") });
+      references.push({ path: resolve(nuxt.options.buildDir, "imports.d.ts") });
     });
-    flow.hook("builder:watch", async (_, path) => {
-      const _resolved = resolve(flow.options.srcDir, path);
-      if (composablesDirs.find((dir) => _resolved.startsWith(dir)))
-        await flow.callHook("builder:generateApp");
+    const templates = [
+      "types/imports.d.ts",
+      "imports.d.ts",
+      "imports.mjs"
+    ];
+    nuxt.hook("builder:watch", async (_, path) => {
+      const _resolved = resolve(nuxt.options.srcDir, path);
+      if (composablesDirs.find((dir) => _resolved.startsWith(dir))) {
+        await updateTemplates({
+          filter: (template) => templates.includes(template.filename)
+        });
+      }
     });
-    flow.hook("builder:generateApp", async () => {
-      await regenerateAutoImports();
+    nuxt.hook("builder:generateApp", async () => {
+      await regenerateImports();
     });
   }
 });
-function addDeclarationTemplates(ctx) {
+function addDeclarationTemplates(ctx, options) {
   const nuxt = useNuxt();
   const stripExtension = (path) => path.replace(/\.[a-z]+$/, "");
   const resolved = {};
@@ -212,46 +246,64 @@ function addDeclarationTemplates(ctx) {
   };
   addTemplate({
     filename: "imports.d.ts",
-    getContents: () => ctx.toExports()
+    getContents: () => ctx.toExports(nuxt.options.buildDir)
   });
   addTemplate({
-    filename: "types/auto-imports.d.ts",
-    getContents: () => `// Generated by auto imports
-${ctx.generateTypeDecarations({ resolvePath: r })}`
+    filename: "types/imports.d.ts",
+    getContents: async () => `// Generated by auto imports
+${options.autoImport ? await ctx.generateTypeDeclarations({ resolvePath: r }) : "// Implicit auto importing is disabled, you can use explicitly import from `#imports` instead."}`
   });
 }
 
-async function resolvePagesRoutes() {
+async function resolveFiles(dir) {
   const nuxt = useNuxt();
-  const pagesDirs = [...new Set(nuxt.options._layers.map((layer) => resolve(layer.config.srcDir, layer.config.dir?.pages || "pages")))];
-  const allRoutes = (await Promise.all(pagesDirs.map(async (dir) => {
-    const files = await resolveFilesFlow(dir, `**/*{${nuxt.options.extensions.join(",")}}`);
-    files.sort();
-    return files.map((file) => {
-      const segments = relative(dir, file).replace(new RegExp(`${escapeRE(extname(file))}$`), "").split("/").join("_");
-      return {
-        file,
-        name: camelCase(segments)
-      };
-    });
-  }))).flat();
+  const dirs = [resolve(nuxt.options.srcDir, dir)];
+  const allRoutes = (await Promise.all(
+    dirs.map(async (dir2) => {
+      const files = await resolveFilesFlow(dir2, `**/*{${nuxt.options.extensions.join(",")}}`);
+      files.sort();
+      return files.filter((file) => {
+        if (file.includes(" copy"))
+          return false;
+        if (!fs.readFileSync(file, "utf8").includes("export"))
+          return false;
+        return true;
+      }).map((file) => {
+        const segments = relative(dir2, file).replace(new RegExp(`${escapeRE(extname(file))}$`), "").split("/").join("_");
+        return {
+          file,
+          name: camelCase(segments)
+        };
+      });
+    })
+  )).flat();
   return allRoutes;
 }
-function normalizePages(pages) {
-  const imports = pages.map((page) => genImport(page.file, [{ name: "pages", as: page.name }])).join("\n");
+function normalizeExports(files) {
+  const imports = files.map((page) => genImport(page.file, page.name)).join("\n");
+  const exports = files.reduce((acc, curr) => {
+    const name = curr.name;
+    return `${name}:typeof ${name}==='function'?${name}():${name},${acc}`;
+  }, "");
   return {
     imports,
-    exports: pages.reduce((acc, curr) => `${curr.name || ""},${acc}`, "")
+    exports
   };
 }
 
 const pagesTypeTemplate = {
-  filename: "pages.d.ts",
+  filename: "types/pages.d.ts",
   getContents: ({ options }) => `// Generated by pages discovery
 export {}
 declare global {
+  type ArrElement<ArrType> = ArrType extends readonly (infer ElementType)[]
+  ? ElementType
+  : never;
 
-${options.pages.map((c) => `export type ${pascalCase(c.name)}Context=Awaited<ReturnType<typeof ${genDynamicImport(isAbsolute(c.file) ? relative(options.buildDir, c.file) : c.file, { wrapper: false })}['pages']['locales']['es-ec']['context']>>`).join("\n")}
+${options.pages.map((c) => {
+    const _type = `ArrElement<typeof ${genDynamicImport(isAbsolute(c.file) ? relative(join(options.buildDir, "types"), c.file) : c.file, { wrapper: false })}['default']>`;
+    return `export type ${pascalCase(c.name)}Context=Awaited<ReturnType<${_type}['locales']['es-ec']['context']>>`;
+  }).join("\n")}
 }
 export const pagesNames: string[]
 `.replaceAll(".ts", "")
@@ -263,157 +315,75 @@ const pagesModule = defineNuxtModule({
   },
   async setup(_options, flow) {
     const runtimeDir = resolve(distDir, "pages/runtime");
+    flow.options.alias["#_pages"] = runtimeDir;
     const pages = [];
-    flow.hook("builder:watch", async (event, path) => {
-      const dirs = [
-        flow.options.dir.pages,
-        flow.options.dir.layouts,
-        flow.options.dir.middleware
-      ].filter(Boolean);
-      const pathPattern = new RegExp(`^(${dirs.map(escapeRE).join("|")})/`);
-      if (event !== "change" && path.match(pathPattern))
-        await flow.callHook("builder:generateApp");
-    });
-    const options = { pages, buildDir: flow.options.buildDir };
+    const contexts = [];
+    const options = { pages, buildDir: flow.options.buildDir, contexts };
     addTemplate({
       ...pagesTypeTemplate,
       options
     });
+    const pagesDirs = [{ path: resolve(flow.options.srcDir, flow.options.dir.pages) }];
     flow.options.alias["#pages"] = resolve(flow.options.buildDir, "pages.mjs");
+    flow.options.alias["#pagesContexts"] = resolve(flow.options.buildDir, "pages.contexts.mjs");
     addTemplate({
       filename: "pages.mjs",
       async getContents({ options: options2 }) {
-        const { exports, imports } = normalizePages(options2.pages);
-        return [imports, `export default {${exports}}`].join("\n");
+        const { exports, imports } = normalizeExports(options2.pages);
+        const module = [imports, `export default {${exports}}`].join("\n");
+        return module;
+      },
+      options
+    });
+    addTemplate({
+      filename: "pages.contexts.mjs",
+      async getContents({ options: options2 }) {
+        const { exports, imports } = normalizeExports(options2.contexts);
+        const module = [imports, `export default {${exports}}`].join("\n");
+        return module;
       },
       options
     });
     flow.hook("app:templates", async () => {
-      options.pages = await resolvePagesRoutes();
+      options.pages = await resolveFiles(flow.options.dir?.pages || "pages");
+    });
+    flow.hook("app:templates", async () => {
+      options.contexts = await resolveFiles("shared/contexts");
     });
     flow.hook("prepare:types", ({ references }) => {
-      references.push({ path: resolve(flow.options.buildDir, "pages.d.ts") });
+      references.push({ path: resolve(flow.options.buildDir, "types/pages.d.ts") });
     });
-    addPlugin({ src: resolve(runtimeDir, "plugin") });
-  }
-});
-
-const createClient = async (flow) => {
-  let vite;
-  if (globalThis.viteClient) {
-    vite = globalThis.viteClient;
-  } else {
-    vite = await createServer({
-      root: resolve(flow.options.rootDir),
-      base: "/_vite/",
-      build: {
-        manifest: true
-      },
-      server: {
-        watch: {
-          ignored: ["**/.env/**", "**/.env*"]
-        },
-        middlewareMode: "ssr"
-      }
+    flow.hook("builder:watch", async (event, path) => {
+      if (!["add", "unlink", "change"].includes(event))
+        return;
+      if (path.includes(" copy"))
+        return;
+      const fPath = resolve(flow.options.rootDir, path);
+      if (pagesDirs.find((dir) => fPath.startsWith(dir.path)))
+        await flow.callHook("builder:generateApp");
     });
-    globalThis.viteClient = vite;
-  }
-  const _doReload = () => {
-    if (vite)
-      vite?.ws?.send({ type: "full-reload" });
-  };
-  const doReload = debounce(_doReload, 60);
-  flow.hook("bundler:change", () => {
-    doReload();
-  });
-  flow.hook("close", async () => {
-    vite.restart();
-  });
-  return vite;
-};
-const builClient = async (flow) => {
-  return await build$1({
-    root: flow.options.rootDir,
-    mode: "production",
-    build: {
-      assetsDir: "scripts",
-      target: "es2017",
-      outDir: ".vite",
-      manifest: true
-    }
-  });
-};
-
-const viteModule = defineFlowModule({
-  meta: {
-    name: "vite-client",
-    configKey: "bundle"
-  },
-  defaults: {
-    route: "/_vite/",
-    dir: "/client/pages"
-  },
-  async setup(_options, flow) {
-    const runtimeDir = resolve(distDir, "vite-client/runtime");
-    flow.options.alias["#viteManifest"] = resolve(flow.options.buildDir, "viteManifest.mjs");
-    let vite;
-    if (flow.options.dev) {
-      flow.hook("nitro:init", async (nitro) => {
-        vite = await createClient(flow);
-        nitro.options.devHandlers.push({
-          handler: vite.middlewares,
-          route: _options.route
-        });
-      });
-      addTemplate({
-        filename: "viteManifest.mjs",
-        async getContents() {
-          return [
-            "export default {",
-            `head:()=>'<script type="module" src="${joinURL("/", _options.route, "/@vite/client")}"><\/script>'`,
-            ",",
-            `body: (bundle)=>\`<script type="module" src="${joinURL("/", _options.route, _options.dir)}/\${bundle}.ts"><\/script>\``,
-            "}"
-          ].join("\n");
-        }
-      });
-    } else {
-      flow.hook("modules:done", async () => {
-        const start = Date.now();
-        logger$1.info("Building client...");
-        await builClient(flow);
-        const file = resolve(flow.options.rootDir, ".vite/manifest.json");
-        const manifest = await fse.readFile(file, "utf8");
-        logger$1.success(`Client build in ${Date.now() - start}ms`);
-        addTemplate({
-          filename: "viteManifest.mjs",
-          async getContents() {
-            return [
-              "export default ()=>(",
-              manifest,
-              ")"
-            ].join("\n");
-          }
-        });
-      });
-      flow.hook("generate:before", async () => {
-        const files = resolve(flow.options.rootDir, ".vite/scripts");
-        await fse.copy(files, resolve(flow.options.generate.dir, "assets"));
-      });
-    }
-    addPlugin({ src: resolve(runtimeDir, "plugin") });
+    addPlugin(resolve(runtimeDir, "pages"));
   }
 });
 
 const _require = createRequire(import.meta.url);
 const ImportProtectionPlugin = createUnplugin((options) => {
   const cache = {};
+  const importersToExclude = options?.exclude || [];
   return {
-    name: "flow:import-protection",
+    name: "nuxt:import-protection",
     enforce: "pre",
     resolveId(id, importer) {
+      if (!importer)
+        return;
+      if (id.startsWith("."))
+        id = join(importer, "..", id);
+      if (isAbsolute(id))
+        id = relative(options.rootDir, id);
+      if (importersToExclude.some((p) => typeof p === "string" ? importer === p : p.test(importer)))
+        return;
       const invalidImports = options.patterns.filter(([pattern]) => pattern instanceof RegExp ? pattern.test(id) : pattern === id);
-      let matched;
+      let matched = false;
       for (const match of invalidImports) {
         cache[id] = cache[id] || /* @__PURE__ */ new Map();
         const [pattern, warning] = match;
@@ -432,25 +402,38 @@ const ImportProtectionPlugin = createUnplugin((options) => {
 });
 
 async function initNitro(flow) {
-  const { handlers, devHandlers } = await resolveHandlers(flow);
   const _nitroConfig = flow.options.nitro || {};
   globalThis.generate = {};
+  const scanDirs = flow.options._layers.map((layer) => (layer.config.serverDir || layer.config.srcDir) && resolve(layer.cwd, layer.config.serverDir || resolve(layer.config.srcDir, "server"))).filter(Boolean);
   const nitroConfig = defu(_nitroConfig, {
     rootDir: flow.options.rootDir,
-    srcDir: join(flow.options.srcDir, "server"),
+    workspaceDir: flow.options.workspaceDir,
+    srcDir: flow.options.serverDir,
     dev: flow.options.dev,
-    preset: flow.options.dev ? "nitro-dev" : void 0,
     buildDir: flow.options.buildDir,
-    scanDirs: flow.options._layers.map((layer) => join(layer.config.srcDir, "server")),
+    scanDirs,
     renderer: resolve(distDir, "core/runtime/nitro/renderer"),
+    // errorHandler: resolve(distDir, 'core/runtime/nitro/error'),
     nodeModulesDirs: flow.options.modulesDir,
-    handlers,
+    handlers: [
+      //* Important middleware
+      {
+        middleware: true,
+        handler: resolve(distDir, "core/runtime/nitro/flow")
+      },
+      ...flow.options.serverHandlers
+    ],
+    output: {
+      dir: resolve(flow.options.buildDir, "output")
+    },
     devHandlers: [],
     baseURL: flow.options.app.baseURL,
+    virtual: {},
     runtimeConfig: {
       ...flow.options.runtimeConfig,
       app: {
         ...flow.options.runtimeConfig.app,
+        baseURL: flow.options.dev ? "/" : flow.options.app.baseURL,
         rootDir: flow.options.rootDir,
         locale: flow.options.locale
       },
@@ -465,62 +448,81 @@ async function initNitro(flow) {
     },
     publicAssets: [
       {
-        baseURL: flow.options.app.buildAssetsDir,
+        // baseURL: flow.options.app.buildAssetsDir,
         dir: resolve(flow.options.buildDir, "dist/client")
       },
       ...flow.options._layers.map((layer) => join(layer.config.srcDir, layer.config.dir?.public || "public")).filter((dir) => existsSync(dir)).map((dir) => ({ dir }))
     ],
     prerender: {
-      crawlLinks: flow.options._generate ? flow.options.generate.crawler : false,
-      routes: [].concat(flow.options._generate ? ["/_urls", ...flow.options.generate.routes] : [])
+      crawlLinks: flow.options._generate ?? void 0,
+      routes: [].concat(flow.options.generate.routes).concat(flow.options._generate ? ["/_urls", ...flow.options.generate.routes] : [])
     },
-    sourcemap: flow.options.sourcemap,
+    sourceMap: flow.options.sourcemap.server,
     externals: {
       inline: [
         ...flow.options.dev ? [] : ["eta", "@monkeyplus/", "@vue/", "@nuxt/", flow.options.buildDir],
-        "@monkeyplus/flow/dist"
+        "@monkeyplus/flow/dist",
+        // Dev windows
+        "C:/Users/gnu/Documents/GitHub/flow/packages/flow/dist/app",
+        distDir
       ]
     },
+    // preset: flow.options.dev ? 'nitro-dev' : undefined,
+    // output: {
+    //   dir: resolve(flow.options.buildDir, 'output'),
+    // },
+    replace: {
+      "process.dev": flow.options.dev
+    },
     alias: {
+      // Vue 3 mocks
       "estree-walker": "unenv/runtime/mock/proxy",
       "@babel/parser": "unenv/runtime/mock/proxy",
+      // Paths
       "#paths": resolve(distDir, "core/runtime/nitro/paths"),
+      // Shortcut to server main file
       "#server": "#build/dist/server/server.mjs",
-      "#app": flow.options.appDir,
+      // Nuxt aliases
       ...flow.options.alias
     },
     rollupConfig: {
       plugins: []
+    },
+    // watchOptions:{}
+    //* Include to refresh server
+    devServer: {
+      watch: [resolve(flow.options.buildDir, "dist/server/server.mjs")]
     }
   });
+  nitroConfig.rollupConfig.plugins.push(
+    ImportProtectionPlugin.rollup({
+      rootDir: flow.options.rootDir,
+      patterns: [
+        ...["#app", /^#build(\/|$)/].map((p) => [p, "Vue app aliases are not allowed in server routes."])
+      ],
+      exclude: [/core[\\/]runtime[\\/]nitro[\\/]renderer/]
+    })
+  );
   await flow.callHook("nitro:config", nitroConfig);
-  nitroConfig.handlers.unshift({
-    middleware: true,
-    handler: resolve(distDir, "core/runtime/nitro/flow")
-  });
   const nitro = await createNitro(nitroConfig);
+  flow._nitro = nitro;
+  flow.nitro = nitro;
   await flow.callHook("nitro:init", nitro);
   nitro.vfs = flow.vfs = nitro.vfs || flow.vfs || {};
   flow.hook("close", () => nitro.hooks.callHook("close"));
-  nitro.hooks.hook("rollup:before", (nitro2) => {
-    const plugin = ImportProtectionPlugin.rollup({
-      rootDir: flow.options.rootDir,
-      patterns: [
-        ...["#app", /^#build(\/|$)/].map((p) => [p, "Flow app aliases are not allowed in server routes."])
-      ]
-    });
-    nitro2.options.rollupConfig.plugins.push(plugin);
+  nitro.hooks.hook("prerender:routes", (routes) => {
+    flow.callHook("prerender:routes", { routes });
   });
-  const devMidlewareHandler = dynamicEventHandler();
-  nitro.options.devHandlers.unshift({ handler: devMidlewareHandler });
-  nitro.options.devHandlers.push(...devHandlers);
+  const devMiddlewareHandler = dynamicEventHandler();
+  nitro.options.devHandlers.unshift({ handler: devMiddlewareHandler });
+  nitro.options.devHandlers.push(...flow.options.devServerHandlers);
   nitro.options.handlers.unshift({
-    route: "/__flow_error",
+    route: "/__nuxt_error",
     lazy: true,
     handler: resolve(distDir, "core/runtime/nitro/renderer")
   });
   flow.hook("prepare:types", async (opts) => {
-    if (flow.options._prepare) {
+    if (!flow.options.dev) {
       await scanHandlers(nitro);
       await writeTypes(nitro);
     }
@@ -529,21 +531,15 @@ async function initNitro(flow) {
   flow.hook("build:done", async () => {
     await flow.callHook("nitro:build:before", nitro);
     if (flow.options.dev) {
-      await build$2(nitro);
+      await build$1(nitro);
     } else {
+      console.log("build", flow.options._generate);
       await prepare(nitro);
       await copyPublicAssets(nitro);
       await prerender(nitro);
       if (!flow.options._generate) {
-        await build$2(nitro);
+        await build$1(nitro);
       } else {
-        const nitroDev = await createNitro({
-          ...nitro.options._config,
-          rootDir: nitro.options.rootDir,
-          logLevel: 0,
-          preset: "nitro-prerender"
-        });
-        flow.server = nitroDev;
         const distDir2 = resolve(flow.options.rootDir, "dist");
         if (!existsSync(distDir2))
           await promises.symlink(nitro.options.output.publicDir, distDir2, "junction").catch(() => {
@@ -552,37 +548,27 @@ async function initNitro(flow) {
     }
   });
   if (flow.options.dev) {
-    flow.hook("build:compile", ({ compiler }) => {
-      compiler.outputFileSystem = { ...fse, join };
+    flow.hook("vite:compiled", () => {
+      flow.server.reload();
     });
-    flow.hook("server:devMiddleware", (m) => {
-      devMidlewareHandler.set(toEventHandler(m));
+    flow.hook("server:devHandler", (h) => {
+      devMiddlewareHandler.set(h);
     });
     flow.server = createDevServer(nitro);
-    flow.hook("build:resources", () => {
-      flow.server.reload();
-    });
     const waitUntilCompile = new Promise((resolve2) => nitro.hooks.hook("compiled", () => resolve2()));
     flow.hook("build:done", () => waitUntilCompile);
   }
 }
-async function resolveHandlers(flow) {
-  const handlers = [...flow.options.serverHandlers];
-  const devHandlers = [...flow.options.devServerHandlers];
-  return {
-    handlers,
-    devHandlers
-  };
-}
 
 const addModuleTranspiles = (opts = {}) => {
   const flow = useNuxt();
   const modules = [
     ...opts.additionalModules || [],
+    // ...flow.options.buildModules,
     ...flow.options.modules,
     ...flow.options._modules
   ].map((m) => typeof m === "string" ? m : Array.isArray(m) ? m[0] : m.src).filter((m) => typeof m === "string").map((m) => m.split("node_modules/").pop());
-  flow.options.build.transpile = flow.options.build.transpile.map((m) => typeof m === "string" ? m.split("node_modules/").pop() : m);
+  flow.options.build.transpile = flow.options.build.transpile.map((m) => typeof m === "string" ? m.split("node_modules/").pop() : m).filter((x) => !!x);
   function isTranspilePresent(mod) {
     return flow.options.build.transpile.some((t) => !(t instanceof Function) && (t instanceof RegExp ? t.test(mod) : new RegExp(t).test(mod)));
   }
@@ -595,7 +581,10 @@ const addModuleTranspiles = (opts = {}) => {
 function createFlow(options) {
   const hooks = createHooks();
   const flow = {
-    _version: "3.0.0-rc.3",
+    //* Include nuxt version
+    _version: "3.0.0",
+    //* Include version
+    // @ts-ignore
     version,
     options,
     hooks,
@@ -609,10 +598,12 @@ function createFlow(options) {
   return flow;
 }
 async function initFlow(flow) {
+  flow.hooks.addHooks(flow.options.hooks);
   nuxtCtx.set(flow);
   flow.hook("close", () => nuxtCtx.unset());
-  await flow.callHook("modules:before", { nuxt: flow });
+  await flow.callHook("modules:before");
   const modulesToInstall = [
+    // ...flow.options.buildModules,
     ...flow.options.modules,
     ...flow.options._modules
   ];
@@ -622,16 +613,26 @@ async function initFlow(flow) {
     else
       await installModule(m, {});
   }
-  await flow.callHook("modules:done", { nuxt: flow });
-  await addModuleTranspiles();
+  await flow.callHook("modules:done");
+  flow.options.build.transpile = flow.options.build.transpile.map((t) => typeof t === "string" ? normalize(t) : t);
+  addModuleTranspiles();
   await initNitro(flow);
   await flow.callHook("ready", flow);
 }
 async function loadFlow(opts) {
+  const start1 = Date.now();
   const options = await loadFlowConfig(opts);
+  logger.info(`Config loading in ${Date.now() - start1}ms`);
   options.appDir = resolve(distDir, "app");
+  options.alias["#app"] = resolve(distDir, "app/index");
   options._majorVersion = 3;
-  options._modules.push(pagesModule, metaModule, autoImportsModule, viteModule);
+  options._modules.push(pagesModule, metaModule);
+  options._modules.push([importsModule, {
+    transform: {
+      include: options._layers.filter((i) => i.cwd && i.cwd.includes("node_modules")).map((i) => new RegExp(`(^|\\/)${escapeRE(i.cwd.split("node_modules/").pop())}(\\/|$)(?!node_modules\\/)`))
+    }
+  }]);
+  options.modulesDir.push(resolve(options.workspaceDir, "node_modules"));
   options.modulesDir.push(resolve(pkgDir, "node_modules"));
   const flow = createFlow(options);
   if (opts.ready !== false)
@@ -646,11 +647,17 @@ const serverPluginTemplate = {
   filename: "plugins/server.mjs",
   getContents(ctx) {
     const serverPlugins = ctx.app.plugins;
+    const exports = [];
+    const imports = [];
+    for (const plugin of serverPlugins) {
+      const path = relative(ctx.nuxt.options.rootDir, plugin.src);
+      const variable = `${genSafeVariableName(path).replace(/_(45|46|47)/g, "_")}_${hash(path)}`;
+      exports.push(variable);
+      imports.push(genImport(plugin.src, variable));
+    }
     return [
-      templateUtils.importSources(serverPlugins.map((p) => p.src)),
-      `export default ${genArrayFromRaw([
-        ...serverPlugins.map((p) => templateUtils.importName(p.src))
-      ])}`
+      ...imports,
+      `export default ${genArrayFromRaw(exports)}`
     ].join("\n");
   }
 };
@@ -679,43 +686,52 @@ export { }
 `;
   }
 };
-const adHocModules = ["auto-imports", "meta", "pages", "vite-client"];
+const adHocModules = ["imports", "meta", "pages"];
 const schemaTemplate = {
   filename: "types/schema.d.ts",
-  getContents: ({ nuxt }) => {
+  getContents: async ({ nuxt }) => {
     const moduleInfo = nuxt.options._installedModules.map((m) => ({
       ...m.meta || {},
       importName: m.entryPath || m.meta?.name
     })).filter((m) => m.configKey && m.name && !adHocModules.includes(m.name));
+    const relativeRoot = relative(resolve(nuxt.options.buildDir, "types"), nuxt.options.rootDir);
     return [
       "import { FlowModule } from '@monkeyplus/flow-schema'",
       "declare module '@monkeyplus/flow-schema' {",
       "  interface FlowConfig {",
-      ...moduleInfo.filter(Boolean).map((meta) => `    [${genString(meta.configKey)}]?: typeof ${genDynamicImport(meta.importName, { wrapper: false })}.default extends FlowModule<infer O> ? Partial<O> : Record<string, any>`),
+      ...moduleInfo.filter(Boolean).map(
+        (meta) => `    [${genString(meta.configKey)}]?: typeof ${genDynamicImport(meta.importName.startsWith(".") ? `./${join(relativeRoot, meta.importName)}` : meta.importName, { wrapper: false })}.default extends FlowModule<infer O> ? Partial<O> : Record<string, any>`
+      ),
       "  }",
-      generateTypes(resolveSchema(Object.fromEntries(Object.entries(nuxt.options.runtimeConfig).filter(([key]) => key !== "public"))), {
-        interfaceName: "RuntimeConfig",
-        addExport: false,
-        addDefaults: false,
-        allowExtraKeys: false,
-        indentation: 2
-      }),
-      generateTypes(resolveSchema(nuxt.options.runtimeConfig.public), {
-        interfaceName: "PublicRuntimeConfig",
-        addExport: false,
-        addDefaults: false,
-        allowExtraKeys: false,
-        indentation: 2
-      }),
+      generateTypes(
+        await resolveSchema(Object.fromEntries(Object.entries(nuxt.options.runtimeConfig).filter(([key]) => key !== "public"))),
+        {
+          interfaceName: "RuntimeConfig",
+          addExport: false,
+          addDefaults: false,
+          allowExtraKeys: false,
+          indentation: 2
+        }
+      ),
+      generateTypes(
+        await resolveSchema(nuxt.options.runtimeConfig.public),
+        {
+          interfaceName: "PublicRuntimeConfig",
+          addExport: false,
+          addDefaults: false,
+          allowExtraKeys: false,
+          indentation: 2
+        }
+      ),
       "}"
     ].join("\n");
   }
 };
 const publicPathTemplate = {
   filename: "paths.mjs",
-  getContents({ nuxt }) {
+  async getContents({ nuxt }) {
     return [
-      "import { joinURL } from 'ufo'",
+      `import { joinURL } from '${await _resolveId("ufo")}'`,
       !nuxt.options.dev && "import { useRuntimeConfig } from '#internal/nitro'",
       nuxt.options.dev ? `const appConfig = ${JSON.stringify(nuxt.options.app)}` : "const appConfig = useRuntimeConfig().app",
       "export const baseURL = () => appConfig.baseURL",
@@ -728,15 +744,39 @@ const publicPathTemplate = {
     ].filter(Boolean).join("\n");
   }
 };
+function _resolveId(id) {
+  return resolvePath(id, {
+    url: [
+      // @ts-ignore
+      global.__NUXT_PREPATHS__,
+      import.meta.url,
+      process.cwd(),
+      // @ts-ignore
+      global.__NUXT_PATHS__
+    ]
+  });
+}
 
 const defaultTemplates = {
   __proto__: null,
-  serverPluginTemplate: serverPluginTemplate,
   pluginsDeclaration: pluginsDeclaration,
+  publicPathTemplate: publicPathTemplate,
   schemaTemplate: schemaTemplate,
-  publicPathTemplate: publicPathTemplate
+  serverPluginTemplate: serverPluginTemplate
 };
 
+function uniqueBy(arr, key) {
+  const res = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const item of arr) {
+    if (seen.has(item[key]))
+      continue;
+    seen.add(item[key]);
+    res.push(item);
+  }
+  return res;
+}
+
 function createApp(flow, options = {}) {
   return defu(options, {
     dir: flow.options.srcDir,
@@ -745,51 +785,95 @@ function createApp(flow, options = {}) {
     templates: []
   });
 }
-async function generateApp(flow, app) {
+async function generateApp(flow, app, options) {
   await resolveApp(flow, app);
-  app.templates = Object.values(defaultTemplates).concat(flow.options.build.templates);
+  app.templates = Object.values(defaultTemplates).concat(
+    flow.options.build.templates
+  );
   await flow.callHook("app:templates", app);
   app.templates = app.templates.map((tmpl) => normalizeTemplate(tmpl));
   const templateContext = { utils: templateUtils, nuxt: flow, app };
-  await Promise.all(app.templates.map(async (template) => {
-    const contents = await compileTemplate(template, templateContext);
-    const fullPath = template.dst || resolve(flow.options.buildDir, template.filename);
-    flow.vfs[fullPath] = contents;
-    const aliasPath = `#build/${template.filename.replace(/\.\w+$/, "")}`;
-    flow.vfs[aliasPath] = contents;
-    if (process.platform === "win32")
-      flow.vfs[fullPath.replace(/\//g, "\\")] = contents;
-    if (template.write) {
-      await promises.mkdir(dirname(fullPath), { recursive: true });
-      await promises.writeFile(fullPath, contents, "utf8");
-    }
-  }));
+  await Promise.all(
+    app.templates.map(async (template) => {
+      const contents = await compileTemplate(template, templateContext);
+      const fullPath = template.dst || resolve(flow.options.buildDir, template.filename);
+      flow.vfs[fullPath] = contents;
+      const aliasPath = `#build/${template.filename.replace(/\.\w+$/, "")}`;
+      flow.vfs[aliasPath] = contents;
+      if (process.platform === "win32")
+        flow.vfs[fullPath.replace(/\//g, "\\")] = contents;
+      if (template.write) {
+        await promises.mkdir(dirname(fullPath), { recursive: true });
+        await promises.writeFile(fullPath, contents, "utf8");
+      }
+    })
+  );
   await flow.callHook("app:templatesGenerated", app);
 }
 async function resolveApp(flow, app) {
-  app.plugins = [...flow.options.plugins.map(normalizePlugin)];
+  app.plugins = [
+    ...flow.options.plugins.map(normalizePlugin)
+  ];
   for (const config of flow.options._layers.map((layer) => layer.config)) {
     app.plugins.push(...[
       ...config.plugins || [],
-      ...await resolveFilesFlow(config.srcDir, [
-        "plugins/*.{ts,js,mjs,cjs,mts,cts}",
-        "plugins/*/index.*{ts,js,mjs,cjs,mts,cts}"
-      ])
+      ...config.srcDir ? await resolveFilesFlow(config.srcDir, [
+        `${config.dir?.plugins || "plugins"}/*.{ts,js,mjs,cjs,mts,cts}`,
+        `${config.dir?.plugins || "plugins"}/*/index.*{ts,js,mjs,cjs,mts,cts}`
+      ]) : []
     ].map((plugin) => normalizePlugin(plugin)));
   }
-  app.plugins = uniqueBy(app.plugins, "src");
+  app.configs = [];
+  for (const config of flow.options._layers.map((layer) => layer.config)) {
+    const appConfigPath = await findPath(resolve(config.srcDir, "app.config"));
+    if (appConfigPath)
+      app.configs.push(appConfigPath);
+  }
   await flow.callHook("app:resolve", app);
+  app.plugins = uniqueBy(app.plugins, "src");
 }
-function uniqueBy(arr, key) {
-  const res = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const item of arr) {
-    if (seen.has(item[key]))
-      continue;
-    seen.add(item[key]);
-    res.push(item);
-  }
-  return res;
+
+const PREFIX = "virtual:nuxt:";
+function virtual(vfs) {
+  const extensions = ["", ".ts", ".vue", ".mjs", ".cjs", ".js", ".json"];
+  const resolveWithExt = (id) => {
+    for (const ext of extensions) {
+      const rId = id + ext;
+      if (rId in vfs)
+        return rId;
+    }
+    return null;
+  };
+  return {
+    name: "virtual",
+    resolveId(id, importer) {
+      if (process.platform === "win32" && isAbsolute(id)) {
+        id = resolve(id);
+      }
+      const resolvedId = resolveWithExt(id);
+      if (resolvedId)
+        return PREFIX + resolvedId;
+      if (importer && !isAbsolute(id)) {
+        const importerNoPrefix = importer.startsWith(PREFIX) ? importer.slice(PREFIX.length) : importer;
+        const importedDir = dirname(importerNoPrefix);
+        const resolved = resolveWithExt(join(importedDir, id));
+        if (resolved)
+          return PREFIX + resolved;
+      }
+      return null;
+    },
+    load(id) {
+      if (!id.startsWith(PREFIX))
+        return null;
+      const idNoPrefix = id.slice(PREFIX.length);
+      if (idNoPrefix in vfs) {
+        return {
+          code: vfs[idNoPrefix],
+          map: null
+        };
+      }
+    }
+  };
 }
 
 async function warmupViteServer(server, entries) {
@@ -810,6 +894,11 @@ async function warmupViteServer(server, entries) {
   await Promise.all(entries.map((entry) => warmup(entry)));
 }
 
+const wpfs = {
+  ...fse,
+  join
+};
+
 function cacheDirPlugin(rootDir, name) {
   const optimizeCacheDir = resolve(rootDir, "node_modules/.cache/vite", name);
   return {
@@ -820,279 +909,63 @@ function cacheDirPlugin(rootDir, name) {
   };
 }
 
-const wpfs = {
-  ...fse,
-  join
-};
-
-function uniq(arr) {
-  return Array.from(new Set(arr));
-}
-const IS_CSS_RE = /\.(?:css|scss|sass|postcss|less|stylus|styl)(\?[^.]+)?$/;
-function isCSS(file) {
-  return IS_CSS_RE.test(file);
-}
-function hashId(id) {
-  return `$id_${hash(id)}`;
-}
-function hash(input, length = 8) {
-  return createHash("sha256").update(input).digest("hex").slice(0, length);
-}
-function readDirRecursively(dir) {
-  return readdirSync(dir).reduce((files, file) => {
-    const name = join(dir, file);
-    const isDirectory2 = statSync(name).isDirectory();
-    return isDirectory2 ? [...files, ...readDirRecursively(name)] : [...files, name];
-  }, []);
-}
-async function isDirectory(path) {
-  try {
-    return (await promises.stat(path)).isDirectory();
-  } catch (_err) {
-    return false;
-  }
-}
-
-function isExternal(opts, id) {
-  const ssrConfig = opts.viteServer.config.ssr;
-  const externalOpts = {
-    inline: [
-      /virtual:/,
-      /\.ts$/,
-      ...ExternalsDefaults.inline,
-      ...ssrConfig.noExternal
-    ],
-    external: [
-      /node_modules/
-    ],
-    resolve: {
-      type: "module",
-      extensions: [".ts", ".js", ".json", ".vue", ".mjs", ".jsx", ".tsx", ".wasm"]
-    }
-  };
-  return isExternal$1(id, opts.viteServer.config.root, externalOpts);
-}
-async function transformRequest(opts, id) {
-  if (id && id.startsWith("/@id/__x00__"))
-    id = `\0${id.slice("/@id/__x00__".length)}`;
-  if (id && id.startsWith("/@id/"))
-    id = id.slice("/@id/".length);
-  if (id && id.startsWith("/@fs/")) {
-    id = id.slice("/@fs".length);
-    if (id.match(/^\/\w:/))
-      id = id.slice(1);
-  } else if (!id.includes("entry") && id.startsWith("/")) {
-    const resolvedPath = resolve(opts.viteServer.config.root, `.${id}`);
-    if (existsSync(resolvedPath))
-      id = resolvedPath;
-  }
-  const withoutVersionQuery = id.replace(/\?v=\w+$/, "");
-  if (await isExternal(opts, withoutVersionQuery)) {
-    const path = builtinModules.includes(withoutVersionQuery.split("node:").pop()) ? withoutVersionQuery : pathToFileURL(withoutVersionQuery).href;
-    return {
-      code: `(global, module, _, exports, importMeta, ssrImport, ssrDynamicImport, ssrExportAll) =>
-${genDynamicImport(path, { wrapper: false })}
-  .then(r => {
-    if (r.default && r.default.__esModule)
-      r = r.default
-    exports.default = r.default
-    ssrExportAll(r)
-  })
-  .catch(e => {
-    console.error(e)
-    throw new Error(${JSON.stringify(`[vite dev] Error loading external "${id}".`)})
-  })`,
-      deps: [],
-      dynamicDeps: []
-    };
-  }
-  const res = await opts.viteServer.transformRequest(id, { ssr: true }).catch((err) => {
-    console.warn(`[SSR] Error transforming ${id}:`, err);
-  }) || { code: "", map: {}, deps: [], dynamicDeps: [] };
-  const code = `async function (global, module, exports, __vite_ssr_exports__, __vite_ssr_import_meta__, __vite_ssr_import__, __vite_ssr_dynamic_import__, __vite_ssr_exportAll__) {
-${res.code || "/* empty */"};
-}`;
-  return { code, deps: res.deps || [], dynamicDeps: res.dynamicDeps || [] };
-}
-async function transformRequestRecursive(opts, id, parent = "<entry>", chunks = {}) {
-  if (chunks[id]) {
-    chunks[id].parents.push(parent);
-    return;
-  }
-  const res = await transformRequest(opts, id);
-  const deps = uniq([...res.deps, ...res.dynamicDeps]);
-  chunks[id] = {
-    id,
-    code: res.code,
-    deps,
-    parents: [parent]
-  };
-  for (const dep of deps)
-    await transformRequestRecursive(opts, dep, id, chunks);
-  return Object.values(chunks);
-}
-async function bundleRequest(opts, entryURL) {
-  const chunks = await transformRequestRecursive(opts, entryURL);
-  const listIds = (ids) => ids.map((id) => `// - ${id} (${hashId(id)})`).join("\n");
-  const chunksCode = chunks.map((chunk) => `
-// --------------------
-// Request: ${chunk.id}
-// Parents: 
-${listIds(chunk.parents)}
-// Dependencies: 
-${listIds(chunk.deps)}
-// --------------------
-const ${hashId(chunk.id)} = ${chunk.code}
-`).join("\n");
-  const manifestCode = `const __modules__ = ${genObjectFromRawEntries(chunks.map((chunk) => [chunk.id, hashId(chunk.id)]))}`;
-  const ssrModuleLoader = `
-const __pendingModules__ = new Map()
-const __pendingImports__ = new Map()
-const __ssrContext__ = { global: globalThis }
-
-function __ssrLoadModule__(url, urlStack = []) {
-  const pendingModule = __pendingModules__.get(url)
-  if (pendingModule) { return pendingModule }
-  const modulePromise = __instantiateModule__(url, urlStack)
-  __pendingModules__.set(url, modulePromise)
-  modulePromise.catch(() => { __pendingModules__.delete(url) })
-         .finally(() => { __pendingModules__.delete(url) })
-  return modulePromise
-}
-
-async function __instantiateModule__(url, urlStack) {
-  const mod = __modules__[url]
-  if (mod.stubModule) { return mod.stubModule }
-  const stubModule = { [Symbol.toStringTag]: 'Module' }
-  Object.defineProperty(stubModule, '__esModule', { value: true })
-  mod.stubModule = stubModule
-  // https://vitejs.dev/guide/api-hmr.html
-  const importMeta = { url, hot: { accept() {}, prune() {}, dispose() {}, invalidate() {}, decline() {}, on() {} } }
-  urlStack = urlStack.concat(url)
-  const isCircular = url => urlStack.includes(url)
-  const pendingDeps = []
-  const ssrImport = async (dep) => {
-    // TODO: Handle externals if dep[0] !== '.' | '/'
-    if (!isCircular(dep) && !__pendingImports__.get(dep)?.some(isCircular)) {
-      pendingDeps.push(dep)
-      if (pendingDeps.length === 1) {
-        __pendingImports__.set(url, pendingDeps)
-      }
-      await __ssrLoadModule__(dep, urlStack)
-      if (pendingDeps.length === 1) {
-        __pendingImports__.delete(url)
-      } else {
-        pendingDeps.splice(pendingDeps.indexOf(dep), 1)
-      }
-    }
-    return __modules__[dep].stubModule
-  }
-  function ssrDynamicImport (dep) {
-    // TODO: Handle dynamic import starting with . relative to url
-    return ssrImport(dep)
-  }
-
-  function ssrExportAll(sourceModule) {
-    for (const key in sourceModule) {
-      if (key !== 'default') {
-        try {
-          Object.defineProperty(stubModule, key, {
-            enumerable: true,
-            configurable: true,
-            get() { return sourceModule[key] }
-          })
-        } catch (_err) { }
-      }
-    }
-  }
-
-  const cjsModule = {
-    get exports () {
-      return stubModule.default
-    },
-    set exports (v) {
-      stubModule.default = v
-    },
-  }
-
-  await mod(
-    __ssrContext__.global,
-    cjsModule,
-    stubModule.default,
-    stubModule,
-    importMeta,
-    ssrImport,
-    ssrDynamicImport,
-    ssrExportAll
-  )
-
-  return stubModule
-}
-`;
-  const code = [
-    chunksCode,
-    manifestCode,
-    ssrModuleLoader,
-    `export default await __ssrLoadModule__(${JSON.stringify(entryURL)})`
-  ].join("\n\n");
-  return {
-    code,
-    ids: chunks.map((i) => i.id)
-  };
-}
-
-async function writeManifest(ctx, extraEntries = []) {
-  const clientDist = resolve(ctx.flow.options.buildDir, "dist/client");
-  const serverDist = resolve(ctx.flow.options.buildDir, "dist/server");
-  const entries = [
-    "@vite/client",
-    "entry.mjs",
-    ...extraEntries
-  ];
-  const devClientManifest = {
-    publicPath: joinURL(ctx.flow.options.app.baseURL, ctx.flow.options.app.buildAssetsDir),
-    all: entries,
-    initial: entries,
-    async: [],
-    modules: {}
-  };
-  const clientManifest = ctx.flow.options.dev ? devClientManifest : await fse.readJSON(resolve(clientDist, "manifest.json"));
-  await fse.mkdirp(serverDist);
-  await fse.writeFile(resolve(serverDist, "client.manifest.json"), JSON.stringify(clientManifest, null, 2), "utf8");
-  await fse.writeFile(resolve(serverDist, "client.manifest.mjs"), `export default ${JSON.stringify(clientManifest, null, 2)}`, "utf8");
-}
-
-const buildServer = async (ctx) => {
+async function buildServer(ctx) {
   const serverConfig = vite.mergeConfig(ctx.config, {
-    configFile: false,
+    base: ctx.nuxt.options.dev ? joinURL(ctx.nuxt.options.app.baseURL.replace(/^\.\//, "/") || "/", ctx.nuxt.options.app.buildAssetsDir) : void 0,
+    // experimental: {
+    //   renderBuiltUrl: (filename, { type, hostType }) => {
+    //     if (hostType !== 'js') {
+    //       // In CSS we only use relative paths until we craft a clever runtime CSS hack
+    //       return { relative: true };
+    //     }
+    //     if (type === 'public')
+    //       return { runtime: `globalThis.__publicAssetsURL(${JSON.stringify(filename)})` };
+    //     if (type === 'asset') {
+    //       const relativeFilename = filename.replace(withTrailingSlash(withoutLeadingSlash(ctx.nuxt.options.app.buildAssetsDir)), '');
+    //       return { runtime: `globalThis.__buildAssetsURL(${JSON.stringify(relativeFilename)})` };
+    //     }
+    //   },
+    // },
     define: {
       "process.server": true,
+      "process.client": false,
       "typeof window": '"undefined"',
       "typeof document": '"undefined"',
       "typeof navigator": '"undefined"',
       "typeof location": '"undefined"',
       "typeof XMLHttpRequest": '"undefined"'
     },
+    resolve: {
+      alias: {
+        "#build/plugins": resolve(ctx.nuxt.options.buildDir, "plugins/server")
+      }
+    },
     ssr: {
+      external: ["#internal/nitro", "#internal/nitro/utils"],
       noExternal: [
-        ...ctx.flow.options.build.transpile,
+        ...ctx.nuxt.options.build.transpile,
+        // TODO: Use externality for production (rollup) build
         /\/esm\/.*\.js$/,
         /\.(es|esm|esm-browser|esm-bundler).js$/,
         "/__vue-jsx",
         "#app",
         /(nuxt|nuxt3)\/(dist|src|app)/,
+        /flow\/(dist|src|app)/,
+        /flow\/modules\/(content|icons|images|netlify|netlify-cms|seo|sitemap|vue)/,
         /@monkeyplus\/flow\/(dist|src|app)/,
         /@nuxt\/nitro\/(dist|src)/
       ]
     },
     build: {
-      outDir: resolve(ctx.flow.options.buildDir, "dist/server"),
-      manifest: true,
+      outDir: resolve(ctx.nuxt.options.buildDir, "dist/server"),
+      ssr: true,
       rollupOptions: {
         external: ["#internal/nitro"],
         output: {
           entryFileNames: "server.mjs",
           preferConst: true,
+          // TODO: https://github.com/vitejs/vite/pull/8641
+          inlineDynamicImports: !ctx.nuxt.options.experimental.viteServerDynamicImports,
           format: "module"
         },
         onwarn(warning, rollupWarn) {
@@ -1102,39 +975,31 @@ const buildServer = async (ctx) => {
       }
     },
     server: {
+      // https://github.com/vitest-dev/vitest/issues/229#issuecomment-1002685027
       preTransformRequests: false,
-      cors: true
+      hmr: false
     },
     plugins: [
-      cacheDirPlugin(ctx.flow.options.rootDir, "server")
+      cacheDirPlugin(ctx.nuxt.options.rootDir, "server"),
+      replace({
+        ...Object.fromEntries([";", "(", "{", "}", " ", "	", "\n"].map((d) => [`${d}global.`, `${d}globalThis.`])),
+        preventAssignment: true
+      })
+      // vuePlugin(ctx.config.vue),
+      // viteJsxPlugin(),
     ]
   });
-  await ctx.flow.callHook("vite:extendConfig", serverConfig, { isClient: false, isServer: true });
-  ctx.flow.hook("nitro:build:before", async () => {
-    if (ctx.flow.options.dev)
-      return;
-    const clientDist = resolve(ctx.flow.options.buildDir, "dist/client");
-    const publicDir = join(ctx.flow.options.srcDir, ctx.flow.options.dir.public);
-    let publicFiles = [];
-    if (await isDirectory(publicDir)) {
-      publicFiles = readDirRecursively(publicDir).map((r) => r.replace(publicDir, ""));
-      for (const file of publicFiles) {
-        try {
-          fse.rmSync(join(clientDist, file));
-        } catch {
-        }
-      }
-    }
-    if (await isDirectory(clientDist)) {
-      const nestedAssetsPath = withoutTrailingSlash(join(clientDist, ctx.flow.options.app.buildAssetsDir));
-      if (await isDirectory(nestedAssetsPath)) {
-        await fse.copy(nestedAssetsPath, clientDist, { recursive: true });
-        await fse.remove(nestedAssetsPath);
+  if (ctx.nuxt.options.typescript.typeCheck === true || ctx.nuxt.options.typescript.typeCheck === "build" && !ctx.nuxt.options.dev) {
+    const checker = await import('vite-plugin-checker').then((r) => r.default);
+    serverConfig.plugins.push(checker({
+      vueTsc: {
+        tsconfigPath: await resolveTSConfig(ctx.nuxt.options.rootDir)
       }
-    }
-  });
-  const onBuild = () => ctx.flow.callHook("build:resources", wpfs);
-  if (!ctx.flow.options.dev) {
+    }));
+  }
+  await ctx.nuxt.callHook("vite:extendConfig", serverConfig, { isClient: false, isServer: true });
+  const onBuild = () => ctx.nuxt.callHook("build:resources", wpfs);
+  if (!ctx.nuxt.options.dev) {
     const start = Date.now();
     logger.info("Building server...");
     await vite.build(serverConfig);
@@ -1144,184 +1009,87 @@ const buildServer = async (ctx) => {
   }
   const viteServer = await vite.createServer(serverConfig);
   ctx.ssrServer = viteServer;
-  await ctx.flow.callHook("vite:serverCreated", viteServer, { isClient: false, isServer: true });
-  ctx.flow.hook("close", () => viteServer.close());
+  await ctx.nuxt.callHook("vite:serverCreated", viteServer, { isClient: false, isServer: true });
+  ctx.nuxt.hook("close", () => viteServer.close());
   await viteServer.pluginContainer.buildStart({});
-  const _doBuild = async () => {
-    const start = Date.now();
-    const { code, ids } = await bundleRequest({ viteServer }, resolve(ctx.flow.options.appDir, "entry"));
-    await fse.ensureFile(resolve(ctx.flow.options.buildDir, "dist/server/server.mjs"));
-    await fse.writeFile(resolve(ctx.flow.options.buildDir, "dist/server/server.mjs"), code, "utf-8");
-    await writeManifest(ctx, ids.filter(isCSS).map((i) => i.slice(1)));
-    const time = Date.now() - start;
-    logger.success(`Vite server built in ${time}ms`);
-    await onBuild();
-    ctx.flow.callHook("bundler:change", {});
-  };
-  const doBuild = debounce(_doBuild);
-  await _doBuild();
-  viteServer.watcher.on("all", (_event, file) => {
-    file = normalize(file);
-    if (file.indexOf(ctx.flow.options.buildDir) === 0)
-      return;
-    doBuild();
-  });
-  ctx.flow.hook("app:templatesGenerated", () => doBuild());
-};
-
-const PREFIX = "virtual:";
-function virtual(vfs) {
-  const extensions = ["", ".ts", ".vue", ".mjs", ".cjs", ".js", ".json"];
-  const resolveWithExt = (id) => {
-    for (const ext of extensions) {
-      const rId = id + ext;
-      if (rId in vfs)
-        return rId;
-    }
-    return null;
-  };
-  return {
-    name: "virtual",
-    resolveId(id, importer) {
-      if (process.platform === "win32" && isAbsolute(id)) {
-        id = resolve(id);
-      }
-      const resolvedId = resolveWithExt(id);
-      if (resolvedId)
-        return PREFIX + resolvedId;
-      if (importer && !isAbsolute(id)) {
-        const importerNoPrefix = importer.startsWith(PREFIX) ? importer.slice(PREFIX.length) : importer;
-        const importedDir = dirname(importerNoPrefix);
-        const resolved = resolveWithExt(join(importedDir, id));
-        if (resolved)
-          return PREFIX + resolved;
-      }
-      return null;
-    },
-    load(id) {
-      if (!id.startsWith(PREFIX))
-        return null;
-      const idNoPrefix = id.slice(PREFIX.length);
-      return {
-        code: vfs[idNoPrefix],
-        map: null
-      };
-    }
-  };
+  await import('./chunks/dev-bundler.mjs').then((r) => r.initViteDevBundler(ctx, onBuild));
 }
 
-const VITE_ASSET_RE = /^export default ["'](__VITE_ASSET.*)["']$/;
-const DynamicBasePlugin = createUnplugin((options = {}) => {
-  return {
-    name: "nuxt:dynamic-base-path",
-    resolveId(id) {
-      if (id.startsWith("/__NUXT_BASE__"))
-        return id.replace("/__NUXT_BASE__", "");
-      if (id === "#internal/nitro")
-        return "#internal/nitro";
-      return null;
-    },
-    enforce: "post",
-    transform(code, id) {
-      const s = new MagicString(code);
-      if (options.globalPublicPath && id.includes("paths.mjs") && code.includes("const appConfig = "))
-        s.append(`${options.globalPublicPath} = buildAssetsURL();
-`);
-      const assetId = code.match(VITE_ASSET_RE);
-      if (assetId) {
-        s.overwrite(0, code.length, [
-          "import { buildAssetsURL } from '#build/paths.mjs';",
-          `export default buildAssetsURL("${assetId[1]}".replace("/__NUXT_BASE__", ""));`
-        ].join("\n"));
-      }
-      if (!id.includes("paths.mjs") && code.includes("NUXT_BASE") && !code.includes("import { publicAssetsURL as __publicAssetsURL }"))
-        s.prepend("import { publicAssetsURL as __publicAssetsURL } from '#build/paths.mjs';\n");
-      if (id === "vite/preload-helper") {
-        s.prepend("import { buildAssetsDir } from '#build/paths.mjs';\n");
-        s.replace(/const base = ['"]\/__NUXT_BASE__\/['"]/, "const base = buildAssetsDir()");
-      }
-      s.replace(/from *['"]\/__NUXT_BASE__(\/[^'"]*)['"]/g, 'from "$1"');
-      const delimiterRE = /(?<!(const base = |from *))(`([^`]*)\/__NUXT_BASE__\/([^`]*)`|'([^']*)\/__NUXT_BASE__\/([^']*)'|"([^"]*)\/__NUXT_BASE__\/([^"]*)")/g;
-      s.replace(delimiterRE, (r) => `\`${r.replace(/\/__NUXT_BASE__\//g, "${__publicAssetsURL()}").slice(1, -1)}\``);
-      if (s.hasChanged()) {
-        return {
-          code: s.toString(),
-          map: options.sourcemap && s.generateMap({ source: id, includeContent: true })
-        };
-      }
-    }
-  };
-});
-
-async function bundleVite(flow) {
-  const hmrPortDefault = 24678;
-  const hmrPort = await getPort({
-    port: hmrPortDefault,
-    ports: Array.from({ length: 20 }, (_, i) => hmrPortDefault + 1 + i)
-  });
+async function bundle$1(nuxt) {
+  const entry = resolve(nuxt.options.appDir, nuxt.options.experimental.asyncEntry ? "entry.async" : "entry");
   const ctx = {
-    nuxt: flow,
-    flow,
-    config: vite.mergeConfig({
-      mode: flow.options.dev ? "development" : void 0,
-      resolve: {
-        alias: {
-          ...flow.options.alias,
-          "#app": flow.options.appDir,
-          "#build/plugins": resolve(flow.options.buildDir, "plugins/server"),
-          "#build": flow.options.buildDir,
-          "/entry.mjs": resolve(flow.options.appDir, "entry")
-        }
-      },
-      optimizeDeps: {
-        entries: [
-          resolve(flow.options.appDir, "entry.ts")
-        ],
-        include: []
-      },
-      build: {
-        rollupOptions: {
-          output: { sanitizeFileName: sanitizeFilePath },
-          input: resolve(flow.options.appDir, "entry")
-        }
-      },
-      plugins: [
-        replace({
-          ...Object.fromEntries([";", "(", "{", "}", " ", "	", "\n"].map((d) => [`${d}global.`, `${d}globalThis.`])),
-          preventAssignment: true
-        }),
-        virtual(flow.vfs),
-        DynamicBasePlugin.vite({ sourcemap: flow.options.sourcemap })
-      ],
-      server: {
-        watch: {
-          ignored: isIgnoredFlow
+    nuxt,
+    entry,
+    config: vite.mergeConfig(
+      {
+        configFile: false,
+        resolve: {
+          alias: {
+            ...nuxt.options.alias,
+            "#app": nuxt.options.appDir,
+            // We need this resolution to be present before the following entry, but it
+            // will be filled in client/server configs
+            "#build/plugins": "",
+            "#build": nuxt.options.buildDir,
+            "web-streams-polyfill/ponyfill/es2018": "unenv/runtime/mock/empty",
+            // Cannot destructure property 'AbortController' of ..
+            "abort-controller": "unenv/runtime/mock/empty"
+          }
+        },
+        optimizeDeps: {
+          entries: [entry],
+          include: []
         },
-        hmr: {
-          protocol: "ws",
-          clientPort: hmrPort,
-          port: hmrPort
+        // css: resolveCSSOptions(nuxt),
+        build: {
+          rollupOptions: {
+            output: { sanitizeFileName: sanitizeFilePath },
+            input: resolve(nuxt.options.appDir, "entry")
+          },
+          watch: {
+            exclude: nuxt.options.ignore
+          }
+        },
+        plugins: [
+          // composableKeysPlugin.vite({ sourcemap: nuxt.options.sourcemap, rootDir: nuxt.options.rootDir }),
+          replace({
+            ...Object.fromEntries([";", "(", "{", "}", " ", "	", "\n"].map((d) => [`${d}global.`, `${d}globalThis.`])),
+            preventAssignment: true
+          }),
+          virtual(nuxt.vfs)
+        ],
+        vue: {
+          reactivityTransform: nuxt.options.experimental.reactivityTransform
         },
-        fs: {
-          allow: [
-            flow.options.appDir
-          ]
+        server: {
+          watch: { ignored: isIgnoredFlow },
+          fs: {
+            allow: [
+              nuxt.options.appDir
+            ]
+          },
+          hmr: false
         }
-      }
-    }, flow.options.vite)
+      },
+      nuxt.options.vite
+    )
   };
-  if (flow.options.dev)
-    ctx.config.mode = process.env.NODE_ENV || "development";
-  await flow.callHook("vite:extend", ctx);
-  flow.hook("vite:serverCreated", (server) => {
+  if (!nuxt.options.dev) {
+    ctx.config.server.watch = void 0;
+    ctx.config.build.watch = void 0;
+  }
+  await nuxt.callHook("vite:extend", ctx);
+  nuxt.hook("vite:serverCreated", (server, env) => {
     ctx.nuxt.hook("app:templatesGenerated", () => {
       for (const [id, mod] of server.moduleGraph.idToModuleMap) {
-        if (id.startsWith("\0virtual:"))
+        if (id.includes("pages."))
+          server.moduleGraph.invalidateModule(mod);
+        if (id.startsWith("\virtual:"))
           server.moduleGraph.invalidateModule(mod);
       }
     });
     const start = Date.now();
-    warmupViteServer(server, ["/entry.mjs"]).then(() => logger.info(`Vite server warmed up in ${Date.now() - start}ms`)).catch(logger.error);
+    warmupViteServer(server, [join("/@fs/", ctx.entry)]).then(() => logger.info(`Vite ${env.isClient ? "client" : "server"} warmed up in ${Date.now() - start}ms`)).catch(logger.error);
   });
   await buildServer(ctx);
 }
@@ -1336,12 +1104,16 @@ async function build(flow) {
       if (event !== "change" && /app|error|plugins/i.test(path))
         await generateApp$1();
     });
-    flow.hook("builder:generateApp", generateApp$1);
+    flow.hook("builder:generateApp", (options) => {
+      if (options)
+        return generateApp(flow, app);
+      return generateApp$1();
+    });
   }
-  await flow.callHook("build:before", { flow }, flow.options.build);
+  await flow.callHook("build:before");
   if (!flow.options._prepare) {
     await bundle(flow);
-    await flow.callHook("build:done", { flow });
+    await flow.callHook("build:done");
   }
   if (!flow.options.dev)
     await flow.callHook("close", flow);
@@ -1357,14 +1129,13 @@ function watch(flow) {
       "node_modules"
     ]
   });
-  const watchHook = debounce((event, path) => flow.callHook("builder:watch", event, normalize(path)));
-  watcher.on("all", watchHook);
+  watcher.on("all", (event, path) => flow.callHook("builder:watch", event, normalize(path)));
   flow.hook("close", () => watcher.close());
   return watcher;
 }
 async function bundle(nuxt) {
   try {
-    return bundleVite(nuxt);
+    return bundle$1(nuxt);
   } catch (error) {
     await nuxt.callHook("build:error", error);
     throw error;