@nativescript/vite 0.0.1-alpha.1 → 0.0.1-alpha.2

package/dist/configuration/base.js

@@ -1,8 +1,11 @@
-import { mergeConfig } from "vite";
+import { mergeConfig, createLogger } from "vite";
 import path from "path";
-import { existsSync } from "fs";
+import { existsSync, readFileSync } from "fs";
+import { createRequire } from "node:module";
+import { pathToFileURL } from "node:url";
 import minimist from "minimist";
 import commonjs from "@rollup/plugin-commonjs";
+import replace from "@rollup/plugin-replace";
 import { viteStaticCopy } from "vite-plugin-static-copy";
 import NativeScriptPlugin from "../helpers/resolver.js";
 import nsConfigAsJsonPlugin from "../helpers/config-as-json.js";
@@ -14,13 +17,18 @@ import { getWorkerPlugins, workerUrlPlugin } from "../helpers/workers.js";
 import { getTsConfigData } from "../helpers/ts-config-paths.js";
 import { commonjsPlugins } from "../helpers/commonjs-plugins.js";
 import { nativescriptPackageResolver } from "../helpers/nativescript-package-resolver.js";
-import { hmrPlugin, cliPlugin } from "../helpers/ns-cli-plugins.js";
+import { cliPlugin } from "../helpers/ns-cli-plugins.js";
 import { dynamicImportPlugin } from "../helpers/dynamic-import-plugin.js";
 import { mainEntryPlugin } from "../helpers/main-entry.js";
 import { determineProjectFlavor } from "../helpers/flavor.js";
 import { preserveImportsPlugin } from "../helpers/preserve-imports.js";
 import { externalConfigMerges, applyExternalConfigs, } from "../helpers/external-configs.js";
-const debugViteLogs = !!process.env.VITE_DEBUG_PATHS;
+import { getHMRPlugins } from "../hmr/plugins/index.js";
+const require = createRequire(import.meta.url);
+const distOutputFolder = process.env.NS_VITE_DIST_DIR || ".ns-vite-build";
+const verboseLogs = !!process.env.VITE_DEBUG_LOGS;
+// HMR dev server options with socket
+const useHttps = process.env.NS_HTTPS === "1" || process.env.NS_HTTPS === "true";
 const projectRoot = getProjectRootPath();
 /**
  * Plugins can define nativescript.vite.mjs
@@ -28,8 +36,7 @@ const projectRoot = getProjectRootPath();
  */
 applyExternalConfigs();
 export const baseConfig = ({ mode }) => {
-    const platform = mode;
-    const targetMode = process.env.production ? "production" : "development";
+    const targetMode = mode === "development" ? "development" : "production";
     const cliArgs = minimist(process.argv.slice(2), { "--": true });
     const cliFlags = (cliArgs["--"] || []).reduce((obj, flag) => {
         // remove env prefix
@@ -38,18 +45,46 @@ export const baseConfig = ({ mode }) => {
         return obj;
     }, {});
     // console.log("cliFlags:", cliFlags);
-    const debug = !!cliFlags.viteDebug || !!process.env.DEBUG || targetMode === "development";
+    const isDevMode = targetMode === "development";
+    const debug = !!process.env.DEBUG || isDevMode;
+    const hmrActive = isDevMode && !!cliFlags.hmr;
+    const platform = cliFlags.platform || "ios";
     if (debug) {
         console.log("--------------");
-        console.log("Vite config mode:", mode);
+        // console.log("Vite config mode:", mode);
         console.log("Target mode:", targetMode);
         console.log("Platform:", platform);
+        console.log("HMR active:", hmrActive);
         console.log("--------------");
     }
     const flavor = determineProjectFlavor();
     console.log(`Building for ${flavor}.`);
+    // Suppress extremely noisy sourcemap warnings for third-party packages
+    // These occur because published packages often omit original TS sources referenced by their .map files.
+    // They have no runtime effect but clutter the console in dev.
+    const baseLogger = createLogger(undefined, { allowClearScreen: true });
+    const filteredLogger = {
+        ...baseLogger,
+        warn(message, options) {
+            const msg = message;
+            if (msg.startsWith("Sourcemap for ") &&
+                msg.includes("missing source files")) {
+                // Swallow this specific noisy warning
+                return;
+            }
+            return baseLogger.warn(message, options);
+        },
+        warnOnce(message) {
+            const msg = message;
+            if (msg.startsWith("Sourcemap for ") &&
+                msg.includes("missing source files")) {
+                return;
+            }
+            return baseLogger.warnOnce(message);
+        },
+    };
     // Create TypeScript aliases with platform support
-    const tsConfigData = getTsConfigData(debugViteLogs, platform);
+    const tsConfigData = getTsConfigData(verboseLogs, platform);
     // Common resolve configuration for both main and worker builds
     // Build platform-aware extension preference order and exclude the opposite platform
     const platformExtensions = (() => {
@@ -79,15 +114,25 @@ export const baseConfig = ({ mode }) => {
         dedupe: ["@nativescript/core", "nativescript-vue", "vue"],
         // Alias "@" and "~" to your src directory for cleaner imports
         alias: [
+            // Provide a shim for node:module to avoid runtime crashes in NS
+            {
+                find: /^node:module$/,
+                replacement: path.resolve(path.dirname(new URL(import.meta.url).pathname), "../shims/node-module.js"),
+            },
+            // Ensure set-value resolves to an absolute shim to avoid alias warnings and duplication
+            [
+                {
+                    find: /^set-value$/,
+                    replacement: require.resolve("@nativescript/vite/dist/shims/set-value.js"),
+                },
+            ],
             ...aliasCssTree,
             // 1) Catch exactly `~/package.json` → virtual module (MUST be first!)
             { find: /^~\/package\.json$/, replacement: "~/package.json" },
             // TypeScript path aliases from tsconfig.json
             ...tsConfigData.aliases,
             // Generic platform resolution for any npm package
-            packagePlatformAliases(tsConfigData, platform, 
-            // skipCommonjsPackages,
-            debugViteLogs),
+            packagePlatformAliases(tsConfigData, platform, verboseLogs),
             // 2) Catch everything else under "~/" → your src/
             { find: /^~\/(.*)$/, replacement: path.resolve(projectRoot, "src/$1") },
             // optional: "@" → src/
@@ -117,21 +162,20 @@ export const baseConfig = ({ mode }) => {
         staticCopyTargets.push({ src: `${fontsAppDir}/**/*`, dest: "fonts" });
     }
     let baseViteConfig = {
+        // Suppress logs during HMR development if desired:
+        // ...(hmrActive ? { logLevel: "warn" as const } : {}),
+        // Filter out noisy sourcemap warnings from dependencies while keeping other warnings intact
+        customLogger: filteredLogger,
         resolve: resolveConfig,
-        define: defineConfig,
+        // Propagate a single verbose flag into the runtime so device-side code can gate logs consistently
+        define: {
+            ...defineConfig,
+            __NS_ENV_VERBOSE__: verboseLogs,
+        },
         // Vite's built-in solution for CommonJS/ESM compatibility issues
         optimizeDeps: {
             // Force pre-bundling of problematic CommonJS packages
-            include: [
-                // "source-map-js",
-                "@valor/nativescript-websockets",
-                // React and related packages for proper module resolution
-                "react",
-                "react-reconciler",
-                "react-nativescript",
-                // ...(optimizeDeps || []),
-                // Add any other problematic packages here
-            ],
+            include: [],
             // Handle Node.js built-ins and other edge cases
             esbuildOptions: {
                 // Pass the same conditions to ESBuild for css-tree compatibility
@@ -139,6 +183,7 @@ export const baseConfig = ({ mode }) => {
                 // Define globals for Node.js built-ins if needed
                 define: {
                     global: "globalThis",
+                    "process.env.NODE_ENV": JSON.stringify(debug ? "development" : "production"),
                 },
             },
             // Avoid pre-bundling NativeScript core to prevent esbuild from stripping side-effectful modules
@@ -146,11 +191,31 @@ export const baseConfig = ({ mode }) => {
                 "@nativescript/core",
                 "@nativescript/core/ui/frame",
                 "@nativescript/core/ui/frame/activity",
+                // Do not prebundle NS-only websocket polyfill or the set-value shim
+                "@valor/nativescript-websockets",
+                "set-value",
+                // Keep React-native related out unless explicitly needed per flavor
+                "react",
+                "react-reconciler",
+                "react-nativescript",
             ],
         },
+        esbuild: {
+            define: {
+                "process.env.NODE_ENV": JSON.stringify(debug ? "development" : "production"),
+            },
+        },
         plugins: [
+            // Ensure Rollup phase replaces in node_modules too
+            // Important for various vendor handling
+            replace({
+                "process.env.NODE_ENV": JSON.stringify(debug ? "development" : "production"),
+                preventAssignment: true,
+            }),
             // Ensure explicit keep markers are honored
             preserveImportsPlugin(),
+            // Vue HMR plugins for development mode
+            ...(hmrActive ? getHMRPlugins(platform, flavor, verboseLogs) : []),
             // TODO: make flavor plugins dynamic
             // ...flavorPlugins,
             ...commonjsPlugins,
@@ -182,22 +247,35 @@ export const baseConfig = ({ mode }) => {
                     }),
                 ]
                 : []),
-            // NativeScript HMR integration - track changes for incremental builds
-            hmrPlugin(targetMode),
-            // NativeScript CLI integration - enhanced IPC communication for HMR
-            cliPlugin(targetMode, cliFlags),
+            // NativeScript CLI integration 
+            cliPlugin(distOutputFolder, isDevMode, verboseLogs, hmrActive),
         ],
         css: {
             postcss: "./postcss.config.js",
         },
         // Development server configuration for HMR
-        server: targetMode === "development"
+        server: isDevMode
             ? {
+                // Expose dev server to local network so simulator or device can connect
+                host: process.env.NS_HMR_HOST ||
+                    (platform === "android" ? "10.0.0.2" : "localhost"),
+                // Use a stable port so the device URL remains correct
+                port: 5173,
+                strictPort: true,
+                https: useHttps
+                    ? {
+                        // Optional: allow self-signed certs via env paths
+                        key: process.env.NS_HTTPS_KEY &&
+                            readFileSync(process.env.NS_HTTPS_KEY),
+                        cert: process.env.NS_HTTPS_CERT &&
+                            readFileSync(process.env.NS_HTTPS_CERT),
+                    }
+                    : undefined,
+                // Keep HMR on the primary server port (Vite browser client stays on /vite-hmr)
                 hmr: {
-                    // Enable Vite's built-in HMR
-                    port: 24678, // Different port to avoid conflicts with our custom WebSocket
+                    protocol: useHttps ? "wss" : "ws",
+                    path: "/vite-hmr",
                 },
-                // CORS for development
                 cors: true,
             }
             : {},
@@ -215,15 +293,23 @@ export const baseConfig = ({ mode }) => {
             },
         },
         build: {
+            // Ensure Vite and plugins (like vite-plugin-static-copy) use the same output directory
+            outDir: path.resolve(projectRoot, distOutputFolder),
             target: "esnext",
             minify: !debug,
             // Generate source maps for debugging
-            // Note: just disabling for now until can hook up to angular vite/analog plugin
-            sourcemap: false, //debug,
+            // External sourcemaps so DevTools loads small .mjs files and fetches maps on demand
+            sourcemap: debug,
             // Disable module preloading to avoid browser APIs
             modulePreload: false,
+            // Under HMR, avoid rebuilds on src/** changes — device consumes updates via /ns-hmr
+            ...(hmrActive && {
+                watch: {
+                    exclude: ["src/**"],
+                },
+            }),
             // Optimize for development speed
-            ...(targetMode === "development" && {
+            ...(isDevMode && {
                 // Faster builds in development
                 reportCompressedSize: false,
                 chunkSizeWarningLimit: 2000,
@@ -239,9 +325,12 @@ export const baseConfig = ({ mode }) => {
                 },
                 input: "virtual:entry-with-polyfills",
                 output: {
-                    dir: path.resolve(projectRoot, "dist"),
                     format: "es", // Emit ES modules (.mjs)
-                    entryFileNames: "bundle.mjs", // <- no hash here
+                    entryFileNames: "bundle.mjs",
+                    // Point source map URLs to absolute file:// paths on the host so
+                    // Chrome DevTools can fetch them even though the running code comes
+                    // from file:///app on the simulator/device.
+                    sourcemapBaseUrl: pathToFileURL(path.resolve(projectRoot, distOutputFolder)).toString() + "/",
                     chunkFileNames: (chunk) => {
                         if (chunk.name === "vendor")
                             return "vendor.mjs";
@@ -267,6 +356,15 @@ export const baseConfig = ({ mode }) => {
                         }
                     },
                 },
+                // When HMR is active, prevent Vite's build watcher from reacting to src/** changes.
+                // The device will get updates via socket /ns-hmr instead.
+                ...(hmrActive
+                    ? {
+                        watch: {
+                            exclude: ["src/**"],
+                        },
+                    }
+                    : {}),
             },
         },
     };

package/dist/helpers/external-configs.js

@@ -16,7 +16,7 @@ export function applyExternalConfigs() {
         }
         const configPath = path.join(packagePath, 'nativescript.vite.mjs');
         if (fs.existsSync(configPath)) {
-            console.log(`Discovered external config: ${configPath}`);
+            console.log(`Found and merged in external config: ${configPath}`);
             try {
                 const externalModule = require(configPath);
                 const externalConfig = externalModule?.default ?? externalModule;

package/dist/helpers/global-defines.d.ts

@@ -11,4 +11,5 @@ export declare function getGlobalDefines(platform: string, targetMode: string):
     __UI_USE_XML_PARSER__: boolean;
     __UI_USE_EXTERNAL_RENDERER__: boolean;
     __TEST__: boolean;
+    "process.env.NODE_ENV": string;
 };

package/dist/helpers/global-defines.js

@@ -14,5 +14,7 @@ export function getGlobalDefines(platform, targetMode) {
         __UI_USE_EXTERNAL_RENDERER__: false,
         // various ecosystems use this global (react for example)
         __TEST__: false,
+        // Critical for various integrations (e.g. Vue only includes hmr runtime on this conditions)
+        "process.env.NODE_ENV": JSON.stringify(targetMode === "development" ? "development" : "production"),
     };
 }

package/dist/helpers/main-entry-hmr-includes.d.ts

@@ -0,0 +1 @@
+export declare function embedMainEntryHMRForFlavor(flavor: string): string;

package/dist/helpers/main-entry-hmr-includes.js

@@ -0,0 +1,18 @@
+export function embedMainEntryHMRForFlavor(flavor) {
+    let imports = "";
+    switch (flavor) {
+        case "vue":
+            // Load HMR client for WebSocket connection to Vite dev server
+            imports += "import 'virtual:hmr-vue';\n";
+            imports +=
+                "console.info('@nativescript/vite HMR Vue client loaded.');\n";
+            break;
+        case "react":
+            break;
+        case "angular":
+            break;
+        case "solid":
+            break;
+    }
+    return imports;
+}

package/dist/helpers/main-entry.d.ts

@@ -1,5 +1,5 @@
 export declare function mainEntryPlugin(cliFlags: any, debug?: boolean, platform?: "ios" | "android" | "visionos"): {
     name: string;
-    resolveId(id: any): string;
-    load(id: any): string;
+    resolveId(id: string): string;
+    load(id: string): string;
 };

package/dist/helpers/main-entry.js

@@ -1,118 +1,82 @@
 import { getPackageJson, getProjectFilePath, getProjectRootPath, } from "./project.js";
 import fs from "fs";
 import path from "path";
+import { determineProjectFlavor } from "./flavor.js";
+import { embedMainEntryHMRForFlavor } from "./main-entry-hmr-includes.js";
 const projectRoot = getProjectRootPath();
 // main entry
 const packageJson = getPackageJson();
 const mainEntry = getProjectFilePath(packageJson.main);
-// console.log("mainEntry:", mainEntry);
-// hmr client
-const hmrClientPath = getProjectFilePath("./node_modules/@nativescript/vite/dist/hmr/hmr-client.js");
-const hmrClientExists = fs.existsSync(hmrClientPath);
-// console.log("hmrClientPath:", hmrClientPath);
-// console.log("hmrClientExists:", hmrClientExists);
+const flavor = determineProjectFlavor();
 // Check if polyfills file exists
 const polyfillsPath = getProjectFilePath("src/polyfills.ts");
 const polyfillsExists = fs.existsSync(polyfillsPath);
-// console.log("polyfillsPath:", polyfillsPath);
-// console.log("polyfillsExists:", polyfillsExists);
 const VIRTUAL_ID = "virtual:entry-with-polyfills";
 const RESOLVED = "\0" + VIRTUAL_ID;
 export function mainEntryPlugin(cliFlags, debug, platform) {
+    const HMR_ACTIVE = debug && !!cliFlags.hmr;
     return {
         name: "main-entry",
         resolveId(id) {
-            if (id === VIRTUAL_ID) {
+            if (id === VIRTUAL_ID)
                 return RESOLVED;
-            }
             return null;
         },
         load(id) {
-            if (id === RESOLVED) {
-                let imports = "";
-                // Align with webpack entry order: core globals and bundle entry points first
-                imports += `import '@nativescript/core/globals/index';\n`;
-                // // explicit extension helps some bundlers to retain side effects
-                imports += `import '@nativescript/core/bundle-entry-points';\n`;
-                // Ensure Android app components are included
-                if (platform === "android") {
-                    // Import explicit Android variants with extension to avoid resolution ambiguity
-                    imports += `import * as __ns_android_frame from '@nativescript/core/ui/frame/index.android.js?ns-keep';\n`;
-                    imports += `import * as __ns_android_activity from '@nativescript/core/ui/frame/activity.android.js?ns-keep';\n`;
-                    // Reference bindings to keep the modules in the graph even if they only have side effects
-                    imports += `void __ns_android_frame; void __ns_android_activity;\n`;
-                    // This may still be needed - needs more testing
-                    // Ensure commonly tree-shaken Android UI modules are included so SBG
-                    // discovers their Java listener/impl classes. Keep imports minimal but
-                    // comprehensive across the missing bindings list.
-                    // const __ns_android_modules = [
-                    //   "@nativescript/core/application",
-                    //   "@nativescript/core/text",
-                    //   "@nativescript/core/timer",
-                    //   "@nativescript/core/utils",
-                    //   "@nativescript/core/ui/gestures",
-                    //   "@nativescript/core/ui/action-bar",
-                    //   "@nativescript/core/ui/dialogs",
-                    //   "@nativescript/core/ui/list-view",
-                    //   "@nativescript/core/ui/search-bar",
-                    //   "@nativescript/core/ui/tab-view",
-                    //   "@nativescript/core/ui/web-view",
-                    //   "@nativescript/core/ui/slider",
-                    //   "@nativescript/core/ui/switch",
-                    //   "@nativescript/core/ui/transition",
-                    //   "@nativescript/core/ui/date-picker",
-                    //   "@nativescript/core/ui/time-picker",
-                    //   "@nativescript/core/ui/image",
-                    //   "@nativescript/core/ui/image-cache",
-                    //   "@nativescript/core/ui/text-base",
-                    //   "@nativescript/core/ui/label",
-                    //   "@nativescript/core/ui/text-field",
-                    //   "@nativescript/core/ui/text-view",
-                    //   "@nativescript/core/text/span",
-                    //   "@nativescript/core/text/formatted-string",
-                    //   "@nativescript/core/ui/animation",
-                    //   "@nativescript/core/ui/layouts/layout-base",
-                    // ];
-                    // for (const m of __ns_android_modules) {
-                    //   imports += `import '${m}?ns-keep';\n`;
-                    // }
-                }
-                if (polyfillsExists) {
-                    imports += `import '${polyfillsPath}';\n`;
-                }
-                // Import CSS and apply via Application.addCss before main entry
-                const appCssPath = path.resolve(projectRoot, "src/app.css");
-                if (fs.existsSync(appCssPath)) {
-                    imports += `
-    // Import and apply global CSS before Angular bootstrap
-    import appCssContent from './src/app.css?inline';
-    import { Application } from '@nativescript/core';
-    
-    if (appCssContent) {
-      try {
-        Application.addCss(appCssContent);
-        // console.log('🎨 Global CSS applied');
-      } catch (error) {
-        console.error('Error applying CSS:', error);
-      }
-    }`;
-                }
-                // Import main entry to initialize after all platform setup above
-                imports += `import '${mainEntry}';\n`;
-                // Import WebSocket support for HMR in development
-                if (debug && cliFlags.hmr && hmrClientExists) {
-                    imports += `import '${hmrClientPath}';\n`;
-                }
-                // Import inspector modules for debugging in development
-                if (debug) {
-                    imports += `import '@nativescript/core/inspector_modules';\n`;
-                }
-                // if (debug) {
-                //   console.log("🔄 Virtual entry imports:", imports);
-                // }
-                return imports;
+            if (id !== RESOLVED)
+                return null;
+            let imports = "";
+            // Align with webpack entry order: core globals and bundle entry points first
+            imports += "import '@nativescript/core/globals/index';\n";
+            // explicit extension helps some bundlers to retain side effects
+            imports += "import '@nativescript/core/bundle-entry-points';\n";
+            // Ensure Android app components are included
+            if (platform === "android") {
+                // Import explicit Android variants with extension to avoid resolution ambiguity
+                imports +=
+                    "import * as __ns_android_frame from '@nativescript/core/ui/frame/index.android.js?ns-keep';\n";
+                imports +=
+                    "import * as __ns_android_activity from '@nativescript/core/ui/frame/activity.android.js?ns-keep';\n";
+                // Reference bindings to keep the modules in the graph even if they only have side effects
+                imports += "void __ns_android_frame; void __ns_android_activity;\n";
             }
-            return null;
+            if (polyfillsExists) {
+                imports += `import '${polyfillsPath}';\n`;
+                imports += `if (__NS_ENV_VERBOSE__) console.info('[ns-entry] polyfills imported from', ${polyfillsPath});\n`;
+            }
+            else {
+                imports += "if (__NS_ENV_VERBOSE__) console.info('[ns-entry] no polyfills file found');\n";
+            }
+            if (HMR_ACTIVE) {
+                // Ensure WebSocket polyfill is loaded early for device runtime
+                imports += "import '@valor/nativescript-websockets';\n";
+                imports += "if (__NS_ENV_VERBOSE__) console.info('[ns-entry] websockets polyfill imported');\n";
+            }
+            // Import CSS and apply via Application.addCss before main entry
+            const appCssPath = path.resolve(projectRoot, "src/app.css");
+            if (fs.existsSync(appCssPath)) {
+                imports += `
+// Import and apply global CSS before app bootstrap
+import appCssContent from './src/app.css?inline';
+import { Application } from '@nativescript/core';
+if (appCssContent) {
+  try { Application.addCss(appCssContent); } catch (error) { console.error('Error applying CSS:', error); }
+}
+`;
+            }
+            // Import the main entry file
+            imports += `if (__NS_ENV_VERBOSE__) console.info('[ns-entry] Importing main entry', '${mainEntry}');\n`;
+            imports += `import '${mainEntry}';\n`;
+            if (HMR_ACTIVE) {
+                // Start HMR client after app boots
+                imports += embedMainEntryHMRForFlavor(flavor);
+            }
+            // Import inspector modules for debugging in development
+            if (debug) {
+                imports += "import '@nativescript/core/inspector_modules';\n";
+                imports += "if (__NS_ENV_VERBOSE__) console.info('[ns-entry] inspector modules imported');\n";
+            }
+            return imports;
         },
     };
 }

package/dist/helpers/module-runner-patch.d.ts

@@ -0,0 +1,3 @@
+import type { Plugin } from "vite";
+export declare function moduleRunnerPatchPlugin(): Plugin;
+export default moduleRunnerPatchPlugin;

package/dist/helpers/module-runner-patch.js

@@ -0,0 +1,65 @@
+// Build-time patch: ensure vendor.mjs's bundled ModuleRunner.getModuleInformation
+// always receives a valid options object with a cache to prevent
+// "Cannot use 'in' operator to search for 'cache' in undefined".
+export function moduleRunnerPatchPlugin() {
+    return {
+        name: "ns-module-runner-patch",
+        apply: "build",
+        enforce: "post",
+        generateBundle(_opts, bundle) {
+            for (const [fileName, chunk] of Object.entries(bundle)) {
+                if (fileName !== "vendor.mjs")
+                    continue;
+                if (chunk.type !== "chunk" || typeof chunk.code !== "string")
+                    continue;
+                let code = chunk.code;
+                // Try to locate the function definition (non-minified dev build keeps names)
+                // Handle both forms: function getModuleInformation(id, options) { ... }
+                // and class method or object method: getModuleInformation(id, options) { ... }
+                const patterns = [
+                    /function\s+getModuleInformation\s*\(([^)]*)\)\s*\{/,
+                    /getModuleInformation\s*\(([^)]*)\)\s*\{/,
+                ];
+                let replaced = false;
+                for (const re of patterns) {
+                    const m = re.exec(code);
+                    if (!m)
+                        continue;
+                    const rawParams = (m[1] || "")
+                        .split(",")
+                        .map((s) => s.trim())
+                        .filter(Boolean);
+                    const idParam = rawParams[0];
+                    const second = rawParams[1];
+                    const third = rawParams[2];
+                    let guard = "\n";
+                    if (third && second) {
+                        // Signature: (id, importer, options)
+                        guard += `if (typeof ${second} !== 'string') ${second} = undefined;\n`;
+                        guard += `${third} = ${third} && typeof ${third}==='object' ? ${third} : {};\n`;
+                        guard += `if (!('cache' in ${third})) ${third}.cache = new Map();\n`;
+                    }
+                    else if (second) {
+                        // Signature: (id, options)
+                        guard += `${second} = ${second} && typeof ${second}==='object' ? ${second} : {};\n`;
+                        guard += `if (!('cache' in ${second})) ${second}.cache = new Map();\n`;
+                    }
+                    else {
+                        // Unknown/minified: use arguments[] positions
+                        guard += `(function(){ try{ var __imp = arguments[1]; if (typeof __imp !== 'string') arguments[1] = undefined; } catch(_){} })();\n`;
+                        guard += `(function(){ try{ var __o = arguments[2] ?? arguments[1]; if (!__o || typeof __o!=='object') { __o = {}; if (arguments.length>2) arguments[2]=__o; else arguments[1]=__o; } if (!('cache' in __o)) __o.cache = new Map(); } catch(_){} })();\n`;
+                    }
+                    // Inject guard right after the opening brace of the function
+                    const start = m.index + m[0].length;
+                    code = code.slice(0, start) + guard + code.slice(start);
+                    replaced = true;
+                    break;
+                }
+                if (replaced) {
+                    chunk.code = code;
+                }
+            }
+        },
+    };
+}
+export default moduleRunnerPatchPlugin;

package/dist/helpers/ns-cli-plugins.d.ts

@@ -1,21 +1,8 @@
-export declare function hmrPlugin(targetMode: string): {
-    name: string;
-    buildStart(): void;
-    watchChange(id: any, { event }: {
-        event: any;
-    }): void;
-    handleHotUpdate({ file, server, timestamp }: {
-        file: any;
-        server: any;
-        timestamp: any;
-    }): any[];
-};
-export declare function cliPlugin(targetMode: string, cliFlags: any): {
+export declare function cliPlugin(distOutputFolder: string, isDevMode: boolean, verboseLogs: boolean, hmrActive: boolean): {
     name: string;
     apply: string;
     enforce: "post";
     configResolved(config: any): void;
-    buildStart(): void;
     generateBundle(options: any, bundle: any): void;
     writeBundle(options: any, bundle: any): void;
     closeBundle(): void;