refactor: use internal #runtime subpath import

package.json

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

src/build/virtual/routing.ts

@@ -23,7 +23,7 @@ export default function routing(nitro: Nitro) {
       );
 
       return /* js */ `
-import * as __routeRules__ from "nitro/~internal/runtime/route-rules";
+import * as __routeRules__ from "#runtime/route-rules";
 import * as srvxNode from "srvx/node"
 import * as h3 from "h3";
 

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

@@ -6,9 +6,9 @@ import { toNodeHandler } from "srvx/node";
 import { getSocketAddress, isSocketSupported } from "get-port-please";
 
 import { useNitroApp, useNitroHooks } from "nitro/app";
-import { startScheduleRunner } from "nitro/~internal/runtime/task";
-import { trapUnhandledErrors } from "nitro/~internal/runtime/error/hooks";
-import { resolveWebsocketHooks } from "nitro/~internal/runtime/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";
 
 // Listen for shutdown signal from runner

src/presets/bun/runtime/bun.ts

@@ -4,9 +4,9 @@ import { serve } from "srvx/bun";
 import wsAdapter from "crossws/adapters/bun";
 
 import { useNitroApp } from "nitro/app";
-import { startScheduleRunner } from "nitro/~internal/runtime/task";
-import { trapUnhandledErrors } from "nitro/~internal/runtime/error/hooks";
-import { resolveWebsocketHooks } from "nitro/~internal/runtime/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";
 
 const port =

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 "nitro/~internal/runtime/task";
+import { runCronTasks } from "#runtime/task";
 import { useNitroApp, useNitroHooks } from "nitro/app";
 
 type MaybePromise<T> = T | Promise<T>;

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

@@ -6,7 +6,7 @@ import { createHandler, fetchHandler } from "./_module-handler.ts";
 
 import { useNitroApp, useNitroHooks } from "nitro/app";
 import { isPublicAssetURL } from "#nitro-internal-virtual/public-assets";
-import { resolveWebsocketHooks } from "nitro/~internal/runtime/app";
+import { resolveWebsocketHooks } from "#runtime/app";
 import { hasWebSocket } from "#nitro-internal-virtual/feature-flags";
 
 const DURABLE_BINDING = "$DurableObject";

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

@@ -4,7 +4,7 @@ import wsAdapter from "crossws/adapters/cloudflare";
 
 import { isPublicAssetURL } from "#nitro-internal-virtual/public-assets";
 import { createHandler } from "./_module-handler.ts";
-import { resolveWebsocketHooks } from "nitro/~internal/runtime/app";
+import { resolveWebsocketHooks } from "#runtime/app";
 import { hasWebSocket } from "#nitro-internal-virtual/feature-flags";
 
 const ws = hasWebSocket

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

@@ -9,8 +9,8 @@ import wsAdapter from "crossws/adapters/cloudflare";
 
 import { useNitroApp } from "nitro/app";
 import { isPublicAssetURL } from "#nitro-internal-virtual/public-assets";
-import { runCronTasks } from "nitro/~internal/runtime/task";
-import { resolveWebsocketHooks } from "nitro/~internal/runtime/app";
+import { runCronTasks } from "#runtime/task";
+import { resolveWebsocketHooks } from "#runtime/app";
 import { hasWebSocket } from "#nitro-internal-virtual/feature-flags";
 
 /**

src/presets/deno/runtime/deno-deploy.ts

@@ -4,7 +4,7 @@ import type { Deno as _Deno } from "@deno/types";
 import wsAdapter from "crossws/adapters/deno";
 
 import { useNitroApp } from "nitro/app";
-import { resolveWebsocketHooks } from "nitro/~internal/runtime/app";
+import { resolveWebsocketHooks } from "#runtime/app";
 import { hasWebSocket } from "#nitro-internal-virtual/feature-flags";
 
 declare global {

src/presets/deno/runtime/deno-server.ts

@@ -4,9 +4,9 @@ import { serve } from "srvx/deno";
 import wsAdapter from "crossws/adapters/deno";
 
 import { useNitroApp } from "nitro/app";
-import { startScheduleRunner } from "nitro/~internal/runtime/task";
-import { trapUnhandledErrors } from "nitro/~internal/runtime/error/hooks";
-import { resolveWebsocketHooks } from "nitro/~internal/runtime/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";
 
 const port =

src/presets/node/runtime/node-cluster.ts

@@ -4,9 +4,9 @@ import { NodeRequest, serve } from "srvx/node";
 import wsAdapter from "crossws/adapters/node";
 
 import { useNitroApp } from "nitro/app";
-import { startScheduleRunner } from "nitro/~internal/runtime/task";
-import { trapUnhandledErrors } from "nitro/~internal/runtime/error/hooks";
-import { resolveWebsocketHooks } from "nitro/~internal/runtime/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";
 
 const port =

src/presets/node/runtime/node-middleware.ts

@@ -3,8 +3,8 @@ import { toNodeHandler } from "srvx/node";
 import wsAdapter from "crossws/adapters/node";
 
 import { useNitroApp } from "nitro/app";
-import { startScheduleRunner } from "nitro/~internal/runtime/task";
-import { resolveWebsocketHooks } from "nitro/~internal/runtime/app";
+import { startScheduleRunner } from "#runtime/task";
+import { resolveWebsocketHooks } from "#runtime/app";
 import { hasWebSocket } from "#nitro-internal-virtual/feature-flags";
 
 const nitroApp = useNitroApp();

src/presets/node/runtime/node-server.ts

@@ -3,9 +3,9 @@ import { NodeRequest, serve } from "srvx/node";
 import wsAdapter from "crossws/adapters/node";
 
 import { useNitroApp } from "nitro/app";
-import { startScheduleRunner } from "nitro/~internal/runtime/task";
-import { trapUnhandledErrors } from "nitro/~internal/runtime/error/hooks";
-import { resolveWebsocketHooks } from "nitro/~internal/runtime/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";
 
 const port =

src/runtime/internal/runtime-config.ts

@@ -1,82 +1,19 @@
 import type { NitroRuntimeConfig } from "nitro/types";
+import { applyEnv } from "./runtime-config.utils.ts";
 import { runtimeConfig } from "#nitro-internal-virtual/runtime-config";
 
-import { snakeCase } from "scule";
-
 export function useRuntimeConfig(): NitroRuntimeConfig {
   return ((useRuntimeConfig as any)._cached ||= getRuntimeConfig());
 }
 
 function getRuntimeConfig() {
   const env = globalThis.process?.env || {};
-
   applyEnv(runtimeConfig, {
     prefix: "NITRO_",
     altPrefix: runtimeConfig.nitro?.envPrefix ?? env?.NITRO_ENV_PREFIX ?? "_",
     envExpansion: Boolean(
       runtimeConfig.nitro?.envExpansion ?? env?.NITRO_ENV_EXPANSION ?? false
     ),
   });
-
   return runtimeConfig;
 }
-
-type EnvOptions = {
-  prefix?: string;
-  altPrefix?: string;
-  envExpansion?: boolean;
-};
-
-function getEnv(key: string, opts: EnvOptions) {
-  const envKey = snakeCase(key).toUpperCase();
-  return (
-    process.env[opts.prefix + envKey] ?? process.env[opts.altPrefix + envKey]
-  );
-}
-
-function _isObject(input: unknown) {
-  return typeof input === "object" && !Array.isArray(input);
-}
-
-export function applyEnv(
-  obj: Record<string, any>,
-  opts: EnvOptions,
-  parentKey = ""
-) {
-  for (const key in obj) {
-    const subKey = parentKey ? `${parentKey}_${key}` : key;
-    const envValue = getEnv(subKey, opts);
-    if (_isObject(obj[key])) {
-      // Same as before
-      if (_isObject(envValue)) {
-        obj[key] = { ...(obj[key] as any), ...(envValue as any) };
-        applyEnv(obj[key], opts, subKey);
-      }
-      // If envValue is undefined
-      // Then proceed to nested properties
-      else if (envValue === undefined) {
-        applyEnv(obj[key], opts, subKey);
-      }
-      // If envValue is a primitive other than undefined
-      // Then set objValue and ignore the nested properties
-      else {
-        obj[key] = envValue ?? obj[key];
-      }
-    } else {
-      obj[key] = envValue ?? obj[key];
-    }
-    // Experimental env expansion
-    if (opts.envExpansion && typeof obj[key] === "string") {
-      obj[key] = _expandFromEnv(obj[key]);
-    }
-  }
-  return obj;
-}
-
-const envExpandRx = /\{\{([^{}]*)\}\}/g;
-
-function _expandFromEnv(value: string) {
-  return value.replace(envExpandRx, (match, key) => {
-    return process.env[key] || match;
-  });
-}

src/runtime/internal/runtime-config.utils.ts

@@ -0,0 +1,61 @@
+import { snakeCase } from "scule";
+
+type EnvOptions = {
+  prefix?: string;
+  altPrefix?: string;
+  envExpansion?: boolean;
+};
+
+export function applyEnv(
+  obj: Record<string, any>,
+  opts: EnvOptions,
+  parentKey = ""
+) {
+  for (const key in obj) {
+    const subKey = parentKey ? `${parentKey}_${key}` : key;
+    const envValue = getEnv(subKey, opts);
+    if (_isObject(obj[key])) {
+      // Same as before
+      if (_isObject(envValue)) {
+        obj[key] = { ...(obj[key] as any), ...(envValue as any) };
+        applyEnv(obj[key], opts, subKey);
+      }
+      // If envValue is undefined
+      // Then proceed to nested properties
+      else if (envValue === undefined) {
+        applyEnv(obj[key], opts, subKey);
+      }
+      // If envValue is a primitive other than undefined
+      // Then set objValue and ignore the nested properties
+      else {
+        obj[key] = envValue ?? obj[key];
+      }
+    } else {
+      obj[key] = envValue ?? obj[key];
+    }
+    // Experimental env expansion
+    if (opts.envExpansion && typeof obj[key] === "string") {
+      obj[key] = _expandFromEnv(obj[key]);
+    }
+  }
+  return obj;
+}
+
+const envExpandRx = /\{\{([^{}]*)\}\}/g;
+
+function _expandFromEnv(value: string) {
+  return value.replace(envExpandRx, (match, key) => {
+    return process.env[key] || match;
+  });
+}
+
+function getEnv(key: string, opts: EnvOptions) {
+  const envKey = snakeCase(key).toUpperCase();
+  return (
+    process.env[opts.prefix + envKey] ?? process.env[opts.altPrefix + envKey]
+  );
+}
+
+function _isObject(input: unknown) {
+  return typeof input === "object" && !Array.isArray(input);
+}

src/runtime/internal/vite/dev-entry.mjs

@@ -2,7 +2,7 @@ import "#nitro-internal-polyfills";
 import wsAdapter from "crossws/adapters/node";
 
 import { useNitroApp } from "nitro/app";
-import { resolveWebsocketHooks } from "nitro/~internal/runtime/app";
+import { resolveWebsocketHooks } from "#runtime/app";
 import { hasWebSocket } from "#nitro-internal-virtual/feature-flags";
 
 const nitroApp = useNitroApp();

src/runtime/internal/vite/ssr-renderer.mjs

@@ -1,4 +1,4 @@
-import { fetchViteEnv } from "nitro/vite/runtime";
+import { fetchViteEnv } from "#vite-runtime";
 
 /** @param {{ req: Request }} HTTPEvent */
 export default function ssrRenderer({ req }) {

test/unit/runtime-config.env.test.ts

@@ -1,11 +1,6 @@
-import { describe, expect, it, vi } from "vitest";
+import { describe, expect, it } from "vitest";
 
-vi.mock("#nitro-internal-virtual/runtime-config", () => ({
-  runtimeConfig: {},
-}));
-
-const { applyEnv } =
-  await import("../../src/runtime/internal/runtime-config.ts");
+import { applyEnv } from "../../src/runtime/internal/runtime-config.utils.ts";
 
 describe("env utils", () => {
   describe("applyEnv", () => {

tsconfig.json

@@ -11,8 +11,7 @@
     "lib": ["es2022", "webworker", "dom.iterable"],
     "types": ["node", "@cloudflare/workers-types"],
     "paths": {
-      "#nitro-internal-virtual/*": ["./src/build/virtual/types/*.ts"],
-      "nitro/~internal/runtime/*": ["./src/runtime/internal/*.ts"]
+      "#nitro-internal-virtual/*": ["./src/build/virtual/types/*.ts"]
     }
   },
   "exclude": [