@nativescript/vite 8.0.0-alpha.2 → 8.0.0-alpha.21

package/hmr/server/import-map.js

@@ -24,6 +24,24 @@ import { getVendorManifest, listVendorModules } from '../shared/vendor/registry.
 import { readFileSync, readdirSync, existsSync } from 'fs';
 import { resolve, join } from 'path';
 import { getProjectRootPath } from '../../helpers/project.js';
+import { buildCoreUrl } from '../../helpers/ns-core-url.js';
+const OMIT_DEVICE_IMPORT_MAP_PACKAGES = new Set(['typescript', 'ts-node', 'esbuild', 'prettier', 'webpack', 'vite', '@nativescript/android', '@nativescript/ios', '@nativescript/visionos', '@nativescript/webpack', '@nativescript/types']);
+const OMIT_DEVICE_IMPORT_MAP_PREFIXES = ['@types/', '@babel/', 'babel-', '@rollup/', '@vitejs/', 'vite-plugin-', '@angular-devkit/', '@angular/build', '@analogjs/'];
+const PREFIX_ONLY_DEVICE_IMPORT_MAP_PACKAGES = new Set(['@nativescript/vite']);
+function getDeviceImportMapExposure(name) {
+    if (PREFIX_ONLY_DEVICE_IMPORT_MAP_PACKAGES.has(name)) {
+        return 'prefix-only';
+    }
+    if (OMIT_DEVICE_IMPORT_MAP_PACKAGES.has(name)) {
+        return 'omit';
+    }
+    for (const prefix of OMIT_DEVICE_IMPORT_MAP_PREFIXES) {
+        if (name.startsWith(prefix)) {
+            return 'omit';
+        }
+    }
+    return 'full';
+}
 /**
  * Generate an import map from the current vendor manifest.
  *
@@ -48,22 +66,56 @@ export function generateImportMap(options) {
     if (manifest) {
         // Map vendor modules to ns-vendor:// — EXACT entries only.
         // No trailing-slash prefixes: subpaths must resolve via HTTP, not vendor.
+        //
+        // IMPORTANT: `@nativescript/core` and any `@nativescript/core/<sub>` are
+        // deliberately routed through the HTTP bridge (`${origin}/ns/core/...`),
+        // NEVER through `ns-vendor://`. Two reasons:
+        //   1. Single realm. The core bridge is the canonical source for every
+        //      `Application`, `View`, `Frame`, etc. instance — having a second
+        //      copy in the vendor registry produces the classic
+        //      `vendorApplicationSame: false` realm split (different
+        //      `globalThis.Application` than the one the iOS/Android hooks
+        //      patched) and HMR placeholder finalize stalls.
+        //   2. Chicken-and-egg. esbuild's vendor build externalizes
+        //      `@nativescript/core(/...)` (see `nsCoreExternalPlugin` in
+        //      `manifest.ts`), so the externalized `import` statements stay
+        //      in `vendor.mjs` itself. If those externals resolve through
+        //      `ns-vendor://`, the synthetic wrapper module's evaluation
+        //      runs DURING `vendor.mjs` linking — but `vendor-bootstrap`
+        //      hasn't populated `__nsVendorRegistry` yet (it runs LATER,
+        //      from the clientUrl module body), so every wrapper throws
+        //      `Vendor module not found in registry: @nativescript/core/...`.
+        //      Routing core through the HTTP bridge sidesteps the registry
+        //      lookup entirely; the dev server normalizes platform suffixes
+        //      (see `normalizeCoreSub` in `ns-core-url.ts`) so
+        //      `@nativescript/core/ui/frame/activity.android` → bridge URL
+        //      `/ns/core/ui/frame/activity.android` → served from the
+        //      platform-specific `.android.ts` source.
         const vendorModules = listVendorModules();
         for (const specifier of vendorModules) {
+            if (specifier === '@nativescript/core' || specifier.startsWith('@nativescript/core/')) {
+                continue;
+            }
             imports[specifier] = `ns-vendor://${specifier}`;
         }
         // Map aliases from the manifest (e.g., "solid-js/web" → ns-vendor://solid-js)
         if (manifest.aliases) {
             for (const [alias, canonical] of Object.entries(manifest.aliases)) {
+                // Same single-realm + chicken-and-egg reasons as above.
+                if (alias === '@nativescript/core' || alias.startsWith('@nativescript/core/')) {
+                    continue;
+                }
                 if (!imports[alias] && imports[canonical]) {
                     imports[alias] = imports[canonical];
                 }
             }
         }
     }
-    // @nativescript/core → bridge endpoint
-    imports['@nativescript/core'] = `${origin}/ns/core`;
-    imports['@nativescript/core/'] = `${origin}/ns/core/`;
+    // @nativescript/core → bridge endpoint (canonical URL generator).
+    // The trailing-slash entry intentionally uses the same generator so
+    // subpath imports resolve via `${origin}/ns/core/<sub>`.
+    imports['@nativescript/core'] = buildCoreUrl(origin);
+    imports['@nativescript/core/'] = `${buildCoreUrl(origin)}/`;
     // Add framework-specific entries
     addFrameworkEntries(imports, origin, flavor);
     // Scan installed packages and add HTTP URL entries for ALL packages
@@ -111,7 +163,7 @@ export function buildRuntimeConfig(options) {
         volatilePatterns,
     };
 }
-function addFrameworkEntries(imports, _origin, flavor) {
+function addFrameworkEntries(imports, origin, flavor) {
     switch (flavor) {
         case 'vue':
             // nativescript-vue should resolve from vendor if available
@@ -123,10 +175,27 @@ function addFrameworkEntries(imports, _origin, flavor) {
             }
             break;
         case 'solid':
-            // Solid runtime root should resolve from vendor
-            if (!imports['solid-js']) {
-                imports['solid-js'] = `ns-vendor://solid-js`;
-            }
+            // Solid runtime root MUST resolve to the same HTTP URL that
+            // Vite's solid-js alias produces for user code and the
+            // HTTP-served `@solid-refresh` middleware. The vendor bundle
+            // no longer ships `solid-js` for the Solid flavor — see
+            // `manifest.ts`'s `nsSolidJsExternalPlugin` + the matching
+            // `addCandidate` skip — so all three import sites (vendor's
+            // externalized `import 'solid-js'`, user code's
+            // alias-rewritten `/ns/m/node_modules/solid-js/...`, and
+            // `@solid-refresh`'s own rewritten import) converge on the
+            // dev.js URL below. V8's ESM loader dedupes by URL, so the
+            // app sees one `Owner` module-local, one `$DEVCOMP`/`$PROXY`
+            // symbol identity, and one reactive graph end-to-end. Without
+            // this unification, `solid-refresh`'s `setComp` ticks a
+            // signal whose subscribers live in a different solid-js
+            // realm than the page tree's render effect → HMR appears to
+            // fire (toast shows) but the screen never re-renders, and
+            // boot logs the `computations created outside a createRoot`
+            // warning because solid-refresh's HMRComp memo is created in
+            // the HTTP-side solid-js whose `Owner` was never set by the
+            // vendor-side `render()` createRoot.
+            imports['solid-js'] = `${origin}/ns/m/node_modules/solid-js/dist/dev.js`;
             // No trailing-slash prefix — subpaths like solid-js/store,
             // solid-js/jsx-runtime resolve via HTTP from discoverInstalledPackages()
             break;
@@ -153,23 +222,12 @@ function discoverInstalledPackages(imports, origin) {
     const nodeModulesDir = resolve(projectRoot, 'node_modules');
     if (!existsSync(nodeModulesDir))
         return;
-    // Packages that should never be in the import map (build tools, types)
-    const SKIP_PREFIXES = ['@types/', '@babel/', 'babel-', '@nativescript/types'];
-    const SKIP_EXACT = new Set(['typescript', 'ts-node', 'esbuild', 'prettier', 'webpack', '@nativescript/android', '@nativescript/ios', '@nativescript/visionos', '@nativescript/webpack', '@nativescript/types']);
-    const shouldSkip = (name) => {
-        if (SKIP_EXACT.has(name))
-            return true;
-        for (const prefix of SKIP_PREFIXES) {
-            if (name.startsWith(prefix))
-                return true;
-        }
-        return false;
-    };
     const addPackage = (name) => {
-        if (shouldSkip(name))
+        const exposure = getDeviceImportMapExposure(name);
+        if (exposure === 'omit')
             return;
         // Add exact entry only if not already mapped (vendor packages already have ns-vendor:// exact entries)
-        if (!imports[name]) {
+        if (exposure === 'full' && !imports[name]) {
             imports[name] = `${origin}/ns/m/node_modules/${name}`;
         }
         // ALWAYS add trailing-slash prefix for HTTP subpath resolution,

package/hmr/server/import-map.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-map.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/server/import-map.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"import-map.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/server/import-map.ts"],"names":[],"mappings":"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"}

package/hmr/server/index.d.ts

@@ -1,5 +1,6 @@
+import type { NsDevPlatform } from '../shared/runtime/browser-runtime-contract.js';
 export declare function getHMRPlugins(opts: {
-    platform: string;
+    platform: NsDevPlatform;
     flavor: string;
     verbose: boolean;
 }): import("vite").Plugin<any>[];

package/hmr/server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAEjH,MAAM,UAAU,aAAa,CAAC,IAA4D;IACzF,MAAM,OAAO,GAAG,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9C,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;QACrB,KAAK,KAAK;YACT,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;YACpC,MAAM;QACP,KAAK,OAAO;YACX,MAAM;QACP,KAAK,SAAS;YACb,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;YACxC,MAAM;QACP,KAAK,YAAY;YAChB,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;YAC3C,MAAM;QACP,KAAK,OAAO;YACX,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;YACtC,MAAM;IACR,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/vite/hmr/server/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAEjH,MAAM,UAAU,aAAa,CAAC,IAAmE;IAChG,MAAM,OAAO,GAAG,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9C,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;QACrB,KAAK,KAAK;YACT,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;YACpC,MAAM;QACP,KAAK,OAAO;YACX,MAAM;QACP,KAAK,SAAS;YACb,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;YACxC,MAAM;QACP,KAAK,YAAY;YAChB,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;YAC3C,MAAM;QACP,KAAK,OAAO;YACX,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;YACtC,MAAM;IACR,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC"}

package/hmr/server/ns-core-cjs-shape.d.ts

@@ -0,0 +1,204 @@
+/**
+ * CJS/ESM interop shape.
+ *
+ * PROBLEM
+ * -------
+ * ESM Module Namespace Objects (ECMA §9.4.6) have [[Prototype]] = null.
+ * They do NOT inherit Object.prototype — no `hasOwnProperty`, no `toString`,
+ * no `isPrototypeOf`. CJS consumers (most notably zone.js's `patchMethod`)
+ * assume their require() result is a plain object that has those methods:
+ *
+ *     let proto = target;
+ *     while (proto && !proto.hasOwnProperty(name)) // ← crashes on null-proto
+ *       proto = Object.getPrototypeOf(proto);
+ *
+ * `@nativescript/core/index.js` re-exports several sub-modules as namespaces:
+ *
+ *     export * as Utils from './utils';
+ *     export * as Http from './http';
+ *     export * as Connectivity from './connectivity';
+ *     export * as ApplicationSettings from './application-settings';
+ *
+ * When bundle.mjs does `import { Utils } from '@nativescript/core'`, `Utils`
+ * binds to that null-proto sub-namespace. zone.js then does
+ * `patchMethod(Utils, 'mainThreadify', …)` and crashes.
+ *
+ * WHY globalThis.require shims ALONE DON'T FIX THIS
+ * -------------------------------------------------
+ * ESM imports never pass through `globalThis.require`. They go through the
+ * host's ESM linker (V8 on iOS). Shimming `require` only intercepts the CJS
+ * path (vendor packages that use `require('@nativescript/core')`); direct
+ * ESM imports of `Utils` still see the raw null-proto namespace.
+ *
+ * THE FIX
+ * -------
+ * Rewrite `export * as X from 'Y'` at the /ns/core bridge response level:
+ *
+ *     // before
+ *     export * as Utils from './utils';
+ *
+ *     // after
+ *     import * as __ns_re_Utils__ from './utils';
+ *     export const Utils = __NS_CJS_SHAPE__(__ns_re_Utils__);
+ *
+ * Now `Utils` is a plain Object (inherits Object.prototype). Zone.js's
+ * `patchMethod(Utils, ...)` succeeds. The shape function is recursive —
+ * nested namespaces get the same treatment — and identity-preserving
+ * (WeakMap-cached) so mutations stick across lookups.
+ *
+ * WHY THE SHAPE INSTALL MUST RUN IN MODULE BODY (NOT FOOTER)
+ * ---------------------------------------------------------
+ * `export const Utils = __NS_CJS_SHAPE__(__ns_re_Utils__)` is body code. It
+ * executes during module evaluation, BEFORE the registration footer. So the
+ * shape function must be installed as a body-level statement that runs
+ * before the rewritten body — we can't rely on the footer's install.
+ *
+ * Each served /ns/core module independently installs the shape function via
+ * an idempotent `|| (globalThis.__NS_CJS_SHAPE__ = ...)` assignment. The
+ * first module to evaluate wins; subsequent evaluations are no-ops. This
+ * also handles dependency-before-importer order (depth-first ESM eval):
+ * `/ns/core/utils` evaluates before `/ns/core` main, so the shape helper
+ * is in place whenever any body needs it.
+ */
+/**
+ * Body-code statements that idempotently install `globalThis.__NS_CJS_SHAPE__`
+ * and `globalThis.__NS_CJS_SHAPE_CACHE__`. Must execute BEFORE any transformed
+ * `export const X = __NS_CJS_SHAPE__(...)` statement in the same module.
+ *
+ * Properties:
+ *   - Recursive: traverses nested namespaces so `Utils.Something` is also
+ *     a plain Object (if that sub-namespace is itself null-proto).
+ *   - Identity-preserving: WeakMap keyed on the underlying ESM namespace.
+ *     zone.js mutates its patch target; a fresh copy per call would lose
+ *     mutations. Every lookup of the same namespace returns the same
+ *     shaped object.
+ *   - Cycle-safe: records the output in the cache BEFORE recursing into
+ *     children. Handles `core ↔ platform` style cycles.
+ *   - TDZ-safe: wraps each property read in try/catch. Some exports
+ *     (Angular zone.js with early-access patterns) are still in their
+ *     temporal dead zone when the namespace is first snapshotted. A thrown
+ *     property read is skipped rather than failing the whole shape.
+ */
+export declare function buildShapeInstallHeader(): string;
+/**
+ * Rewrite namespace re-exports from CJS-incompatible ESM namespace form into
+ * shape-aware const exports. Handles the two forms Vite/esbuild may emit:
+ *
+ *   (1) Original ES2020 syntax preserved unchanged:
+ *       export * as X from 'Y';
+ *
+ *   (2) Transpiled form esbuild emits when targeting older ES:
+ *       import * as _foo from 'Y';
+ *       export { _foo as X };
+ *
+ * Both become:
+ *   import * as __ns_re_X__ from 'Y';
+ *   export const X = __NS_CJS_SHAPE__(__ns_re_X__);
+ *
+ * Notes on the transform:
+ *   - The internal binding uses a derived name (`__ns_re_<X>__`) so
+ *     collisions with user bindings are extremely unlikely. Core doesn't
+ *     declare identifiers matching that shape.
+ *   - `__NS_CJS_SHAPE__` is read from globalThis with a defensive fallback
+ *     (identity function) in case installation failed or runs in an
+ *     environment where it hasn't been initialized yet. This makes the
+ *     transform safe to apply to modules that don't always go through the
+ *     /ns/core handler's headers.
+ *   - We do NOT shape `export *` (star re-exports without alias). Those
+ *     spread individual named exports — they don't create a nested
+ *     namespace and aren't affected by the null-proto issue.
+ *   - We do NOT shape `export { x } from 'y'` forms. Those copy individual
+ *     named exports directly; the consumer never sees the namespace.
+ *
+ * The regex is intentionally precise. It matches only the `export * as X from
+ * 'Y'` syntactic form (and its transpiled equivalent) — no accidental matches
+ * in string literals or comments because those can't start a top-level
+ * statement with `export`.
+ */
+export declare function rewriteNamespaceReExportsForShape(code: string): string;
+/**
+ * Convenience: returns true if the given code appears to contain at least one
+ * namespace re-export that would benefit from the shape transform. Used to
+ * skip the regex replace for modules that don't need it (keeps the response
+ * identical for most submodules, which just have plain `export * from` or
+ * named exports).
+ */
+export declare function hasNamespaceReExport(code: string): boolean;
+/**
+ * Default-export bridge footer.
+ *
+ * BACKGROUND
+ * ----------
+ * Upstream consumer rewrites in the /ns/m handler convert
+ * `import { X } from '@nativescript/core'` into
+ * `import __ns_core_ns from '/ns/core'; const { X } = __ns_core_ns;`
+ * — a DEFAULT import followed by destructuring. The inline comment on that
+ * rewrite says explicitly: "This makes `import { Frame } from
+ * '@nativescript/core'` work even if the bridge provides only a default
+ * export."
+ *
+ * The original `@nativescript/core/index.js` has no `export default` — all
+ * named exports. Without this footer, consumers of the transformed import
+ * fail at ESM link time:
+ *
+ *     SyntaxError: The requested module '/ns/core/<ver>' does not
+ *     provide an export named 'default'
+ *
+ * THE FIX
+ * -------
+ * Emit `export default __ns_core_self_ns__;` at the end of the served
+ * module body. `__ns_core_self_ns__` is the namespace import the server
+ * already emits at the top of every /ns/core response for self-
+ * registration purposes. ESM spec guarantees a module re-entering itself
+ * during evaluation returns the in-progress namespace — so no extra
+ * evaluation occurs, and the default binding receives an object whose
+ * properties are every named export of the same module.
+ *
+ * CONSUMER MATRIX AFTER THIS FIX
+ * ------------------------------
+ *   • `import X from '/ns/core'` (default)     → X = self namespace
+ *   • `import * as X from '/ns/core'`          → X = self namespace + X.default = self
+ *   • `import { X } from '/ns/core'` (named)   → individual named binding (untouched)
+ *   • `const { X } = <default-import>`         → destructure from self namespace
+ *   • `require('@nativescript/core')` (CJS)    → shaped self via registry
+ *
+ * SKIP CONDITIONS
+ * ---------------
+ * Returns empty string when the source already declares a default export
+ * (some deep subpaths do — e.g. a file that does `export default MyClass`
+ * would SyntaxError on a duplicate). The consumer rewrite is also gated
+ * on `isDeepCoreSubpath`, so those paths don't normally hit the default-
+ * import pattern anyway.
+ *
+ * WHY THE DEFAULT ISN'T SHAPED
+ * ----------------------------
+ * The default is the raw null-proto MNO. This is intentional:
+ *
+ *   1. All current default-import consumers either destructure or do
+ *      property access. Neither requires Object.prototype in the chain.
+ *   2. Shaping the default inside the module body would require calling
+ *      __NS_CJS_SHAPE__ on a namespace whose own `default` slot is still
+ *      being initialized — temporal dead zone hazard.
+ *   3. CJS consumers that need `.hasOwnProperty` go through the registry
+ *      (shaped at registration), not through the default import.
+ *
+ * If a future consumer surfaces that calls `.hasOwnProperty` on the
+ * default, we can revisit. The current rule-of-least-surprise is:
+ * shape at the CJS boundary, not at the ESM boundary.
+ */
+export declare function buildDefaultExportFooter(rewrittenCode: string): string;
+/**
+ * Detects whether a module body already declares a default export in any of
+ * the syntactic forms the ESM spec allows. Mirrors the logic in
+ * `websocket-core-bridge.ts:hasModuleDefaultExport` — kept here so the
+ * default-export bridge helper is self-contained and unit-testable.
+ *
+ * Handles:
+ *   - `export default <expr>;`
+ *   - `export default function|class ...`
+ *   - `export { x as default };`
+ *   - `export { default };`        (implicit `default as default`)
+ *   - `export { default as default };`
+ *   - `export { foo, default };`
+ */
+export declare function hasExistingDefaultExport(code: string): boolean;