feat: mock runtime virtual imports

package.json

@@ -24,11 +24,12 @@
     "./task": "./dist/runtime/task.mjs",
     "./tsconfig": "./lib/tsconfig.json",
     "./types": "./dist/types/index.mjs",
-    "./vite": "./dist/vite.mjs"
+    "./vite": "./dist/vite.mjs",
+    "./vite/runtime": "./dist/runtime/vite.mjs"
   },
   "imports": {
-    "#runtime/*": "./dist/runtime/internal/*.mjs",
-    "#vite-runtime": "./dist/runtime/vite-runtime.mjs"
+    "#nitro/runtime/*": "./dist/runtime/internal/*.mjs",
+    "#nitro/virtual/*": "./dist/runtime/virtual/*.mjs"
   },
   "types": "./lib/index.d.mts",
   "bin": {

src/build/plugins/resolve.ts

@@ -14,11 +14,8 @@ export function nitroResolveIds(): Plugin {
       order: "pre",
       handler(id, importer, rOpts) {
         // Resolve ids with a virtual template parent
-        if (
-          importer &&
-          importer.startsWith("\0nitro:virtual:#nitro-internal-virtual")
-        ) {
-          return this.resolve(id, runtimeDir, { skipSelf: true });
+        if (importer?.includes("#nitro/virtual")) {
+          return this.resolve(id, runtimeDir, { ...rOpts });
         }
         // Resolve mapped subpaths
         const mappedId = subpathMap[id as keyof typeof subpathMap];

src/build/virtual/database.ts

@@ -4,7 +4,7 @@ import { camelCase } from "scule";
 
 export default function database(nitro: Nitro) {
   return {
-    id: "#nitro-internal-virtual/database",
+    id: "#nitro/virtual/database",
     template: () => {
       if (!nitro.options.experimental.database) {
         return /* js */ `export const connectionConfigs = {};`;

src/build/virtual/error-handler.ts

@@ -4,7 +4,7 @@ import { join } from "pathe";
 
 export default function errorHandler(nitro: Nitro) {
   return {
-    id: "#nitro-internal-virtual/error-handler",
+    id: "#nitro/virtual/error-handler",
     template: () => {
       const errorHandlers = Array.isArray(nitro.options.errorHandler)
         ? nitro.options.errorHandler

src/build/virtual/feature-flags.ts

@@ -2,7 +2,7 @@ import type { Nitro } from "nitro/types";
 
 export default function featureFlags(nitro: Nitro) {
   return {
-    id: "#nitro-internal-virtual/feature-flags",
+    id: "#nitro/virtual/feature-flags",
     template: () => {
       const featureFlags: Record<string, boolean> = {
         // Routing

src/build/virtual/plugins.ts

@@ -3,7 +3,7 @@ import { hash } from "ohash";
 
 export default function plugins(nitro: Nitro) {
   return {
-    id: "#nitro-internal-virtual/plugins",
+    id: "#nitro/virtual/plugins",
     template: () => {
       const nitroPlugins = [...new Set(nitro.options.plugins)];
 

src/build/virtual/public-assets.ts

@@ -22,7 +22,7 @@ export default function publicAssets(nitro: Nitro) {
   return [
     // public-assets-data
     {
-      id: "#nitro-internal-virtual/public-assets-data",
+      id: "#nitro/virtual/public-assets-data",
       template: async () => {
         const assets: Record<string, PublicAsset> = {};
         const files = await glob("**", {
@@ -73,7 +73,7 @@ export default function publicAssets(nitro: Nitro) {
 
     // public-assets
     {
-      id: "#nitro-internal-virtual/public-assets",
+      id: "#nitro/virtual/public-assets",
       template: () => {
         const publicAssetBases = Object.fromEntries(
           nitro.options.publicAssets
@@ -90,10 +90,10 @@ export default function publicAssets(nitro: Nitro) {
         type _serveStaticAsKey = Exclude<typeof nitro.options.serveStatic, boolean> | "true" | "false";
         // prettier-ignore
         const handlerName = readAssetHandler[nitro.options.serveStatic as _serveStaticAsKey] || "null";
-        const readAssetImport = `#nitro-internal-virtual/public-assets-${handlerName}`;
+        const readAssetImport = `#nitro/virtual/public-assets-${handlerName}`;
 
         return /* js */ `
-import assets from '#nitro-internal-virtual/public-assets-data'
+import assets from '#nitro/virtual/public-assets-data'
 export { readAsset } from "${readAssetImport}"
 export const publicAssetBases = ${JSON.stringify(publicAssetBases)}
 
@@ -125,13 +125,13 @@ export function getAsset (id) {
 
     // public-assets-node
     {
-      id: "#nitro-internal-virtual/public-assets-node",
+      id: "#nitro/virtual/public-assets-node",
       template: () => {
         return /* js */ `
 import { promises as fsp } from 'node:fs'
 import { fileURLToPath } from 'node:url'
 import { resolve, dirname } from 'node:path'
-import assets from '#nitro-internal-virtual/public-assets-data'
+import assets from '#nitro/virtual/public-assets-data'
 export function readAsset (id) {
   const serverDir = dirname(fileURLToPath(globalThis.__nitro_main__))
   return fsp.readFile(resolve(serverDir, assets[id].path))
@@ -141,10 +141,10 @@ export function readAsset (id) {
 
     // public-assets-deno
     {
-      id: "#nitro-internal-virtual/public-assets-deno",
+      id: "#nitro/virtual/public-assets-deno",
       template: () => {
         return /* js */ `
-import assets from '#nitro-internal-virtual/public-assets-data'
+import assets from '#nitro/virtual/public-assets-data'
 export function readAsset (id) {
   // https://deno.com/deploy/docs/serve-static-assets
   const path = '.' + decodeURIComponent(new URL(\`../public\${id}\`, 'file://').pathname)
@@ -155,7 +155,7 @@ export function readAsset (id) {
 
     // public-assets-null
     {
-      id: "#nitro-internal-virtual/public-assets-null",
+      id: "#nitro/virtual/public-assets-null",
       template: () => {
         return /* js */ `
     export function readAsset (id) {
@@ -166,10 +166,10 @@ export function readAsset (id) {
 
     // public-assets-inline
     {
-      id: "#nitro-internal-virtual/public-assets-inline",
+      id: "#nitro/virtual/public-assets-inline",
       template: () => {
         return /* js */ `
-  import assets from '#nitro-internal-virtual/public-assets-data'
+  import assets from '#nitro/virtual/public-assets-data'
   export function readAsset (id) {
     if (!assets[id]) { return undefined }
     if (assets[id]._data) { return assets[id]._data }

src/build/virtual/renderer-template.ts

@@ -8,7 +8,7 @@ import {
 
 export default function rendererTemplate(nitro: Nitro) {
   return {
-    id: "#nitro-internal-virtual/renderer-template",
+    id: "#nitro/virtual/renderer-template",
     template: async () => {
       const template = nitro.options.renderer?.template;
       if (typeof template !== "string") {

src/build/virtual/routing-meta.ts

@@ -2,7 +2,7 @@ import type { Nitro } from "nitro/types";
 
 export default function routingMeta(nitro: Nitro) {
   return {
-    id: "#nitro-internal-virtual/routing-meta",
+    id: "#nitro/virtual/routing-meta",
     template: () => {
       const routeHandlers = uniqueBy(
         Object.values(nitro.routing.routes.routes).flatMap((h) => h.data),

src/build/virtual/routing.ts

@@ -9,7 +9,7 @@ export const RuntimeRouteRules = [
 
 export default function routing(nitro: Nitro) {
   return {
-    id: "#nitro-internal-virtual/routing",
+    id: "#nitro/virtual/routing",
     template: () => {
       const allHandlers = uniqueBy(
         [
@@ -23,7 +23,7 @@ export default function routing(nitro: Nitro) {
       );
 
       return /* js */ `
-import * as __routeRules__ from "#runtime/route-rules";
+import * as __routeRules__ from "#nitro/runtime/route-rules";
 import * as srvxNode from "srvx/node"
 import * as h3 from "h3";
 

src/build/virtual/runtime-config.ts

@@ -2,7 +2,7 @@ import type { Nitro } from "nitro/types";
 
 export default function runtimeConfig(nitro: Nitro) {
   return {
-    id: "#nitro-internal-virtual/runtime-config",
+    id: "#nitro/virtual/runtime-config",
     template: () => {
       return /* js */ `export const runtimeConfig = ${JSON.stringify(
         nitro.options.runtimeConfig || {}

src/build/virtual/server-assets.ts

@@ -17,7 +17,7 @@ interface ResolvedAsset {
 
 export default function serverAssets(nitro: Nitro) {
   return {
-    id: "#nitro-internal-virtual/server-assets",
+    id: "#nitro/virtual/server-assets",
     template: async () => {
       if (nitro.options.dev || nitro.options.preset === "nitro-prerender") {
         return /* js */ `

src/build/virtual/storage.ts

@@ -4,7 +4,7 @@ import { builtinDrivers } from "unstorage";
 
 export default function storage(nitro: Nitro) {
   return {
-    id: "#nitro-internal-virtual/storage",
+    id: "#nitro/virtual/storage",
     template: () => {
       const mounts: { path: string; driver: string; opts: object }[] = [];
 
@@ -29,7 +29,7 @@ export default function storage(nitro: Nitro) {
 
       return /* js */ `
 import { createStorage } from 'unstorage'
-import { assets } from '#nitro-internal-virtual/server-assets'
+import { assets } from '#nitro/virtual/server-assets'
 
 ${driverImports.map((i) => genImport(i, genSafeVariableName(i))).join("\n")}
 

src/build/virtual/tasks.ts

@@ -3,7 +3,7 @@ import { normalize } from "pathe";
 
 export default function tasks(nitro: Nitro) {
   return {
-    id: "#nitro-internal-virtual/tasks",
+    id: "#nitro/virtual/tasks",
     template: () => {
       const _scheduledTasks = Object.entries(nitro.options.scheduledTasks || {})
         .map(([cron, _tasks]) => {

src/presets/_nitro/runtime/nitro-dev.ts

@@ -6,10 +6,10 @@ import { toNodeHandler } from "srvx/node";
 import { getSocketAddress, isSocketSupported } from "get-port-please";
 
 import { useNitroApp, useNitroHooks } from "nitro/app";
-import { startScheduleRunner } from "#runtime/task";
-import { trapUnhandledErrors } from "#runtime/error/hooks";
-import { resolveWebsocketHooks } from "#runtime/app";
-import { hasWebSocket } from "#nitro-internal-virtual/feature-flags";
+import { startScheduleRunner } from "#nitro/runtime/task";
+import { trapUnhandledErrors } from "#nitro/runtime/error/hooks";
+import { resolveWebsocketHooks } from "#nitro/runtime/app";
+import { hasWebSocket } from "#nitro/virtual/feature-flags";
 
 // Listen for shutdown signal from runner
 parentPort?.on("message", (msg) => {

src/presets/_nitro/runtime/service-worker.ts

@@ -1,6 +1,6 @@
 import "#nitro-internal-polyfills";
 import { useNitroApp } from "nitro/app";
-import { isPublicAssetURL } from "#nitro-internal-virtual/public-assets";
+import { isPublicAssetURL } from "#nitro/virtual/public-assets";
 import type { ServerRequest } from "srvx";
 
 const nitroApp = useNitroApp();

src/presets/bun/runtime/bun.ts

@@ -4,10 +4,10 @@ import { serve } from "srvx/bun";
 import wsAdapter from "crossws/adapters/bun";
 
 import { useNitroApp } from "nitro/app";
-import { startScheduleRunner } from "#runtime/task";
-import { trapUnhandledErrors } from "#runtime/error/hooks";
-import { resolveWebsocketHooks } from "#runtime/app";
-import { hasWebSocket } from "#nitro-internal-virtual/feature-flags";
+import { startScheduleRunner } from "#nitro/runtime/task";
+import { trapUnhandledErrors } from "#nitro/runtime/error/hooks";
+import { resolveWebsocketHooks } from "#nitro/runtime/app";
+import { hasWebSocket } from "#nitro/virtual/feature-flags";
 
 const port =
   Number.parseInt(process.env.NITRO_PORT || process.env.PORT || "") || 3000;

src/presets/cloudflare/entry-exports.ts

@@ -11,7 +11,7 @@ export async function setupEntryExports(nitro: Nitro) {
   const originalEntry = nitro.options.entry;
 
   const virtualEntryId = (nitro.options.entry =
-    "#nitro-internal-virtual/cloudflare-server-entry");
+    "#nitro/virtual/cloudflare-server-entry");
   nitro.options.virtual[virtualEntryId] = /* ts */ `
       export * from "${exportsEntry}";
       export * from "${originalEntry}";

src/presets/cloudflare/runtime/_module-handler.ts

@@ -3,7 +3,7 @@ import type * as CF from "@cloudflare/workers-types";
 import type { ExportedHandler } from "@cloudflare/workers-types";
 import type { ServerRequest } from "srvx";
 
-import { runCronTasks } from "#runtime/task";
+import { runCronTasks } from "#nitro/runtime/task";
 import { useNitroApp, useNitroHooks } from "nitro/app";
 
 type MaybePromise<T> = T | Promise<T>;

src/presets/cloudflare/runtime/cloudflare-durable.ts

@@ -5,9 +5,9 @@ import wsAdapter from "crossws/adapters/cloudflare";
 import { createHandler, fetchHandler } from "./_module-handler.ts";
 
 import { useNitroApp, useNitroHooks } from "nitro/app";
-import { isPublicAssetURL } from "#nitro-internal-virtual/public-assets";
-import { resolveWebsocketHooks } from "#runtime/app";
-import { hasWebSocket } from "#nitro-internal-virtual/feature-flags";
+import { isPublicAssetURL } from "#nitro/virtual/public-assets";
+import { resolveWebsocketHooks } from "#nitro/runtime/app";
+import { hasWebSocket } from "#nitro/virtual/feature-flags";
 
 const DURABLE_BINDING = "$DurableObject";
 const DURABLE_INSTANCE = "server";

src/presets/cloudflare/runtime/cloudflare-module.ts

@@ -2,10 +2,10 @@ import "#nitro-internal-polyfills";
 import type { fetch } from "@cloudflare/workers-types";
 import wsAdapter from "crossws/adapters/cloudflare";
 
-import { isPublicAssetURL } from "#nitro-internal-virtual/public-assets";
+import { isPublicAssetURL } from "#nitro/virtual/public-assets";
 import { createHandler } from "./_module-handler.ts";
-import { resolveWebsocketHooks } from "#runtime/app";
-import { hasWebSocket } from "#nitro-internal-virtual/feature-flags";
+import { resolveWebsocketHooks } from "#nitro/runtime/app";
+import { hasWebSocket } from "#nitro/virtual/feature-flags";
 
 const ws = hasWebSocket
   ? wsAdapter({ resolve: resolveWebsocketHooks })