@effindomv2/fui-as 0.1.36 → 0.1.39

package/browser/routed-app-conventions.ts

@@ -1 +1 @@
-export * from './src/routed-app-conventions';
+export * from '../../browser-bridge/src/routed-app-conventions.js';

package/browser/src/common-harness.ts

@@ -1,27 +1 @@
-export type {
-  HarnessAppOptions,
-  HarnessContext,
-  HarnessController,
-  HarnessDebugApi,
-  HarnessExports,
-  HarnessNavigationMode,
-  HarnessOptions,
-  HarnessState,
-  ManagedHarnessOptions,
-  ManagedHistoryState,
-} from './common-harness/types';
-
-export {
-  canManagedNavigateBack,
-  canManagedNavigateForward,
-  pushManagedHistoryEntry,
-  readManagedHistoryState,
-  replaceManagedHistoryEntry,
-  setCurrentManagedHistorySnapshotId,
-  syncManagedHistoryPop,
-} from './common-harness/managed-history';
-
-export {
-  startHarness,
-  startManagedHarness,
-} from './common-harness/managed-harness';
+export * from './shared-browser';

package/browser/src/index.ts

@@ -8,7 +8,7 @@ export {
   replaceManagedHistoryEntry,
   setCurrentManagedHistorySnapshotId,
   syncManagedHistoryPop,
-} from './common-harness';
+} from './shared-browser';
 
 export type {
   HarnessAppOptions,
@@ -21,30 +21,17 @@ export type {
   HarnessState,
   ManagedHarnessOptions,
   ManagedHistoryState,
-} from './common-harness';
-
-export {
-  buildRoutedHarnessRoutes,
-  defineRoutedAppManifest,
-  renderRoutedPageHead,
-  resolveRouteManifest,
-  resolveRoutePath,
-  routeDef,
-  routeHead,
-} from './routed-app-conventions';
+} from './shared-browser';
 
 export {
   startRoutedHarness,
 } from './routed-harness';
 
-export type {
-  RoutedAppHeadTag,
-  RoutedAppRoute,
-  RoutedAppRouteDefinition,
-  RoutedAppRouteManifest,
-  ResolvedRoutedAppRoute,
-  ResolvedRoutedAppRouteManifest,
-} from './routed-app-conventions';
+export {
+  BuildMode,
+  DevToolsDomMirrorMode,
+  PageZoomMode,
+} from '@effindomv2/runtime';
 
 export type {
   RoutedHarnessConfig,
@@ -53,24 +40,30 @@ export type {
 } from './routed-harness';
 
 export type {
+  RoutedAppHeadTag,
+  RoutedAppRoute,
+  RoutedAppRouteDefinition,
+  RoutedAppRouteManifest,
+  ResolvedRoutedAppRoute,
+  ResolvedRoutedAppRouteManifest,
   RoutedHarnessRouteSpec,
-} from './routed-app-conventions';
+} from './shared-browser';
 
 export {
   defineHostEvents,
   hostEvent,
-} from './host-events';
+} from './shared-browser';
 
 export type {
   HostEventMethodDefinition,
   HostEventsDefinition,
   NormalizedHostEventMethod,
-} from './host-events';
+} from './shared-browser';
 
 export {
   defineHostServices,
   hostService,
-} from './host-services';
+} from './shared-browser';
 
 export type {
   HostServiceImportIo,
@@ -78,8 +71,8 @@ export type {
   HostServiceTypeName,
   HostServicesDefinition,
   NormalizedHostServiceMethod,
-} from './host-services';
+} from './shared-browser';
 
 export type {
   WorkerHostServicesBundleConfig,
-} from './worker-types';
+} from './shared-browser';

package/browser/src/routed-harness.ts

@@ -1,194 +1 @@
-import {
-  pushManagedHistoryEntry,
-  replaceManagedHistoryEntry,
-  startManagedHarness,
-  type HarnessAppOptions,
-  type HarnessController,
-  type HarnessExports,
-  type HarnessState,
-} from './common-harness';
-import type { HostEventsDefinition } from './host-events';
-import type { HostServicesDefinition } from './host-services';
-import type { WorkerHostServicesBundleConfig } from './worker-types';
-import type { RoutedHarnessRouteSpec } from './routed-app-conventions';
-
-type NavigationMode = 'push' | 'replace' | 'pop';
-
-declare global {
-  interface Window {
-    __fuiAsReady?: boolean;
-    __fuiAsError?: string;
-  }
-}
-
-export type RoutedHarnessRoute = RoutedHarnessRouteSpec & {
-  readonly matchPath?: string;
-};
-
-export interface RoutedHarnessManagerState {
-  readonly shellId: string;
-  readonly routePath: string;
-  readonly activeWasmPath: string;
-  readonly routeLoads: Readonly<Record<string, number>>;
-}
-
-export interface RoutedHarnessConfig<
-  TExports extends HarnessExports,
-  TRoute extends RoutedHarnessRoute = RoutedHarnessRoute,
-> {
-  readonly shellId: string;
-  readonly routeBase: string;
-  readonly routes: readonly TRoute[];
-  readonly hostEvents?: HostEventsDefinition;
-  readonly hostServices?: HostServicesDefinition;
-  readonly workerHostServices?: WorkerHostServicesBundleConfig;
-  readonly recreateRuntimeOnWarmRouteSwap?: boolean;
-  readonly showLoadingOverlay?: (isWarmRouteSwap: boolean, route: TRoute) => boolean | undefined;
-  readonly onBooting?: () => void;
-  readonly onRouteLoading?: (route: TRoute) => void;
-  readonly onRouteReady?: (state: RoutedHarnessManagerState, route: TRoute) => void;
-  readonly onHarnessStateUpdated?: (state: HarnessState) => void;
-  readonly onHarnessError?: (error: unknown) => void;
-  readonly run: (exports: TExports, route: TRoute) => void;
-  readonly onDispose?: (exports: TExports, route: TRoute) => void;
-}
-
-function normalizeRoutePath(
-  pathname: string,
-  routeBase: string,
-  routeByPath: ReadonlyMap<string, RoutedHarnessRoute>,
-  fallbackRoutePath: string,
-): string {
-  let normalized = pathname;
-  if (normalized.endsWith('/index.html')) {
-    normalized = normalized.slice(0, -'index.html'.length);
-  }
-  if (!normalized.endsWith('/')) {
-    normalized += '/';
-  }
-  if (normalized === routeBase) {
-    return fallbackRoutePath;
-  }
-  return routeByPath.has(normalized) ? normalized : fallbackRoutePath;
-}
-
-function resolveRouteMatchPath(route: RoutedHarnessRoute): string {
-  return route.matchPath ?? route.routePath;
-}
-
-function currentBrowserPath(): string {
-  let pathname = window.location.pathname;
-  if (pathname.endsWith('/index.html')) {
-    pathname = pathname.slice(0, -'index.html'.length);
-  }
-  return pathname.endsWith('/') ? pathname : `${pathname}/`;
-}
-
-export function startRoutedHarness<
-  TExports extends HarnessExports,
-  TRoute extends RoutedHarnessRoute = RoutedHarnessRoute,
->(config: RoutedHarnessConfig<TExports, TRoute>): void {
-  const routeByPath = new Map<string, TRoute>(config.routes.map((route) => [resolveRouteMatchPath(route), route]));
-  const fallbackRoute = config.routes[0];
-  const routeLoads: Record<string, number> = {};
-  let activeRoute: TRoute | null = null;
-  let navigationQueue: Promise<void> = Promise.resolve();
-
-  if (fallbackRoute === undefined) {
-    throw new Error('startRoutedHarness requires at least one route.');
-  }
-
-  function resolveRoute(pathname: string): TRoute {
-    const normalizedPath = normalizeRoutePath(
-      pathname,
-      config.routeBase,
-      routeByPath,
-      resolveRouteMatchPath(fallbackRoute),
-    );
-    return routeByPath.get(normalizedPath) ?? fallbackRoute;
-  }
-
-  function sameBrowserLocation(route: TRoute): boolean {
-    return currentBrowserPath() === resolveRouteMatchPath(route);
-  }
-
-  function buildManagerState(route: TRoute): RoutedHarnessManagerState {
-    return {
-      shellId: config.shellId,
-      routePath: route.routePath,
-      activeWasmPath: route.wasmPath,
-      routeLoads: { ...routeLoads },
-    };
-  }
-
-  async function navigateToRoute(
-    controller: HarnessController,
-    targetUrl: URL,
-    mode: NavigationMode,
-  ): Promise<void> {
-    const route = resolveRoute(targetUrl.pathname);
-    if (mode !== 'pop' && sameBrowserLocation(route) && activeRoute?.routePath === route.routePath) {
-      config.onRouteReady?.(buildManagerState(route), route);
-      window.__fuiAsReady = true;
-      delete window.__fuiAsError;
-      return;
-    }
-
-    const destination = new URL(route.routePath, window.location.origin);
-    destination.search = targetUrl.search;
-    destination.hash = targetUrl.hash;
-    if (mode === 'push') {
-      pushManagedHistoryEntry(destination);
-    } else if (mode === 'replace' && !sameBrowserLocation(route)) {
-      replaceManagedHistoryEntry(destination);
-    }
-
-    window.__fuiAsReady = false;
-    config.onRouteLoading?.(route);
-    const isWarmRouteSwap = activeRoute !== null;
-    if (isWarmRouteSwap && config.recreateRuntimeOnWarmRouteSwap === true) {
-      await controller.recreateRuntime();
-    }
-
-    const appOptions: HarnessAppOptions<TExports> = {
-      wasmPath: route.wasmPath,
-      persistedRestoreMode: activeRoute === null ? 'initial' : (mode === 'pop' ? 'pop' : 'none'),
-      hostEvents: config.hostEvents,
-      hostServices: config.hostServices,
-      workerHostServices: config.workerHostServices,
-      run(exports): void {
-        config.run(exports, route);
-      },
-      onDispose(exports): void {
-        config.onDispose?.(exports, route);
-      },
-      onStateUpdated(state): void {
-        config.onHarnessStateUpdated?.(state);
-      },
-    };
-    const showLoadingOverlay = config.showLoadingOverlay?.(isWarmRouteSwap, route);
-    appOptions.showLoadingOverlay = showLoadingOverlay ?? !isWarmRouteSwap;
-
-    await controller.loadApp(appOptions);
-    routeLoads[route.routePath] = (routeLoads[route.routePath] ?? 0) + 1;
-    activeRoute = route;
-    config.onRouteReady?.(buildManagerState(route), route);
-    window.__fuiAsReady = true;
-    delete window.__fuiAsError;
-  }
-
-  startManagedHarness({
-    onReady: async (controller): Promise<void> => {
-      controller.setSameOriginNavigationHandler((target, mode) => {
-        navigationQueue = navigationQueue.then(() => navigateToRoute(controller, target, mode));
-        return navigationQueue;
-      });
-
-      config.onBooting?.();
-      await navigateToRoute(controller, new URL(window.location.href), 'replace');
-    },
-    onError(error): void {
-      config.onHarnessError?.(error);
-    },
-  });
-}
+export * from './shared-browser';

package/browser/src/shared-browser.ts

@@ -0,0 +1,6 @@
+export * from '../../../browser-bridge/src/managed-harness.js';
+export * from '../../../browser-bridge/src/managed-harness/abi-version.js';
+export * from '../../../browser-bridge/src/managed-harness/persisted-restore-policy.js';
+export * from '../../../browser-bridge/src/managed-harness/ui-chrome.js';
+export * from '../../../browser-bridge/src/routed-app-conventions.js';
+export * from '../../../browser-bridge/src/routed-harness.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effindomv2/fui-as",
-  "version": "0.1.36",
+  "version": "0.1.39",
   "private": false,
   "license": "AGPL-3.0-only OR LicenseRef-EffinDom-Commercial",
   "description": "EffinDom v2 AssemblyScript frontend framework SDK and browser harness",
@@ -45,21 +45,25 @@
       "types": "./browser/src/common-harness.ts",
       "default": "./browser/src/common-harness.ts"
     },
+    "./browser/shared-browser": {
+      "types": "./browser/src/shared-browser.ts",
+      "default": "./browser/src/shared-browser.ts"
+    },
     "./browser/routed-harness": {
       "types": "./browser/src/routed-harness.ts",
       "default": "./browser/src/routed-harness.ts"
     },
     "./browser/host-events": {
-      "types": "./browser/src/host-events.ts",
-      "default": "./browser/src/host-events.ts"
+      "types": "./browser/src/shared-browser.ts",
+      "default": "./browser/src/shared-browser.ts"
     },
     "./browser/host-services": {
-      "types": "./browser/src/host-services.ts",
-      "default": "./browser/src/host-services.ts"
+      "types": "./browser/src/shared-browser.ts",
+      "default": "./browser/src/shared-browser.ts"
     },
     "./browser/worker-types": {
-      "types": "./browser/src/worker-types.ts",
-      "default": "./browser/src/worker-types.ts"
+      "types": "./browser/src/shared-browser.ts",
+      "default": "./browser/src/shared-browser.ts"
     }
   },
   "files": [
@@ -76,26 +80,32 @@
   ],
   "scripts": {
     "guard:runtime-dependency": "bash scripts/check-runtime-dependency.sh",
+    "generate:abi": "mkdir -p build && esbuild ../abi/generate.ts --bundle --format=esm --platform=node --target=node20 --packages=external --outfile=build/generate-abi.mjs && node build/generate-abi.mjs fui-as-ui && node build/generate-abi.mjs fui-as-host && node build/generate-abi.mjs fui-as-enums",
+    "check:abi": "mkdir -p build && esbuild ../abi/generate.ts --bundle --format=esm --platform=node --target=node20 --packages=external --outfile=build/generate-abi.mjs && node build/generate-abi.mjs fui-as-ui --check && node build/generate-abi.mjs fui-as-host --check && node build/generate-abi.mjs fui-as-enums --check",
+    "generate:ui-abi": "npm run generate:abi",
+    "check:ui-abi": "npm run check:abi",
     "build": "npm run guard:runtime-dependency && bash scripts/build.sh",
     "build:only": "npm run guard:runtime-dependency && bash scripts/build.sh",
     "build:full": "npm run guard:runtime-dependency && bash scripts/build.sh",
     "build:demo:as": "bash scripts/build-demo-as.sh",
+    "lint": "cd ../.. && npm run lint:v2",
+    "prepublishOnly": "npm run check:abi && npm run lint && npm run typecheck",
     "test:unit": "npm run guard:runtime-dependency && asp --verbose -c as-pect.config.mjs -a as-pect.asconfig.json",
-    "test:integration": "npm run build:full && playwright test -c playwright.config.ts",
-    "typecheck": "npm run guard:runtime-dependency && tsc -p tsconfig.json --noEmit"
+    "test:integration": "npm --prefix ../.. run build:v2:browser-bridge && npm run build:full && playwright test -c playwright.config.ts",
+    "typecheck": "npm run guard:runtime-dependency && npm run check:abi && tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@assemblyscript/loader": "^0.28.17",
-    "@devcycle/assemblyscript-json": "^2.0.0",
-    "@effindomv2/runtime": "0.1.17"
+    "@assemblyscript/loader": "^0.28.19",
+    "@effindomv2/runtime": "0.1.20"
   },
   "devDependencies": {
-    "@as-pect/assembly": "8.1.0",
-    "@as-pect/cli": "8.1.0",
-    "@as-pect/core": "8.1.0",
+    "@as-pect/assembly": "9.0.0",
+    "@as-pect/cli": "9.0.0",
+    "@as-pect/core": "9.0.0",
     "@playwright/test": "1.59.1",
     "@types/node": "^24.10.1",
-    "assemblyscript": "0.28.17",
+    "assemblyscript": "0.28.19",
+    "@devcycle/assemblyscript-json": "2.0.0",
     "esbuild": "^0.27.7",
     "typescript": "^5.9.3"
   }

package/scripts/build.sh

@@ -13,11 +13,11 @@ WORKER_BOOTSTRAP_BUILD="${PACKAGE_DIR}/build/worker-bootstrap.js"
 WORKER_BOOTSTRAP_MAP_BUILD="${PACKAGE_DIR}/build/worker-bootstrap.js.map"
 WORKER_HOST_SERVICES_BUILD="${PACKAGE_DIR}/build/worker-host-services.js"
 WORKER_HOST_SERVICES_MAP_BUILD="${PACKAGE_DIR}/build/worker-host-services.js.map"
-WORKER_MANIFEST_BUILD="${PACKAGE_DIR}/build/worker-manifest.json"
 FILE_PROCESSING_WORKER_BUILD="${PACKAGE_DIR}/build/file-processing-worker.js"
 FILE_PROCESSING_WORKER_MAP_BUILD="${PACKAGE_DIR}/build/file-processing-worker.js.map"
 HOST_SERVICE_GENERATOR_BUILD="${PACKAGE_DIR}/build/generate-host-services.mjs"
 HOST_EVENT_GENERATOR_BUILD="${PACKAGE_DIR}/build/generate-host-events.mjs"
+ABI_GENERATOR_BUILD="${PACKAGE_DIR}/build/generate-abi.mjs"
 RUNTIME_CONFIG_FILE="effindom-runtime-config.js"
 DEFAULT_MANIFEST_PATH="./runtime/dist/effindom.v2.manifest.json"
 LOADING_OVERLAY_STYLES_FILE="${PACKAGE_DIR}/browser/loading-overlay-styles.html"
@@ -37,6 +37,30 @@ else
   exit 1
 fi
 
+ESBUILD_RUNTIME_ALIAS_ARGS=()
+if [ -f "${REPO_ROOT}/v2/browser-bridge/src/index.ts" ]; then
+  ESBUILD_RUNTIME_ALIAS_ARGS+=(
+    "--alias:@effindomv2/runtime=${REPO_ROOT}/v2/browser-bridge/src/index.ts"
+    "--alias:@effindomv2/runtime/core-types=${REPO_ROOT}/v2/browser-bridge/src/core-types.ts"
+  )
+fi
+
+generate_abi() {
+  npx esbuild "${REPO_ROOT}/v2/abi/generate.ts" \
+    --bundle \
+    --format=esm \
+    --platform=node \
+    --target=node20 \
+    --packages=external \
+    --outfile="${ABI_GENERATOR_BUILD}"
+
+  node "${ABI_GENERATOR_BUILD}" fui-as-ui
+  node "${ABI_GENERATOR_BUILD}" fui-as-host
+  node "${ABI_GENERATOR_BUILD}" fui-as-enums
+}
+
+generate_abi
+
 "${TSC_BIN}" -p tsconfig.json --noEmit
 
 build_app() {
@@ -119,6 +143,10 @@ find_worker_entries() {
 
 resolve_runtime_dist_dir() {
   local candidate=""
+  local public_runtime_dir="${REPO_ROOT}/public/v2/browser-bridge"
+  local package_runtime_dir="${REPO_ROOT}/v2/browser-bridge/dist"
+  local public_manifest="${public_runtime_dir}/effindom.v2.manifest.json"
+  local package_manifest="${package_runtime_dir}/effindom.v2.manifest.json"
   local candidates=()
 
   if [ -n "${EFFINDOM_RUNTIME_DIST_DIR:-}" ]; then
@@ -126,12 +154,18 @@ resolve_runtime_dist_dir() {
   fi
 
   candidates+=(
-    "${REPO_ROOT}/public/v2/browser-bridge"
-    "${REPO_ROOT}/v2/browser-bridge/dist"
+    "${public_runtime_dir}"
+    "${package_runtime_dir}"
     "${PACKAGE_DIR}/node_modules/@effindomv2/runtime/dist"
     "${REPO_ROOT}/node_modules/@effindomv2/runtime/dist"
   )
 
+  if [ -f "${public_manifest}" ] && [ -f "${package_manifest}" ] && ! cmp -s "${public_manifest}" "${package_manifest}"; then
+    echo "Note: using ${public_runtime_dir} for monorepo runtime assets." >&2
+    echo "      ${package_runtime_dir} is a staged package copy and may be stale." >&2
+    echo "      For ABI changes, run repo-root ./build.sh (or npm run build:v2:abi)." >&2
+  fi
+
   for candidate in "${candidates[@]}"; do
     if [ -f "${candidate}/bridge.js" ] && [ -f "${candidate}/effindom.v2.manifest.json" ] && [ -d "${candidate}/runtime" ]; then
       printf '%s\n' "${candidate}"
@@ -144,8 +178,9 @@ resolve_runtime_dist_dir() {
   echo "  - \$EFFINDOM_RUNTIME_DIST_DIR" >&2
   echo "  - ${PACKAGE_DIR}/node_modules/@effindomv2/runtime/dist" >&2
   echo "  - ${REPO_ROOT}/node_modules/@effindomv2/runtime/dist" >&2
-  echo "  - ${REPO_ROOT}/v2/browser-bridge/dist" >&2
   echo "  - ${REPO_ROOT}/public/v2/browser-bridge" >&2
+  echo "  - ${REPO_ROOT}/v2/browser-bridge/dist" >&2
+  echo "Monorepo note: repo-root ./build.sh (or npm run build:v2:abi) refreshes the runtime assets used here." >&2
   echo "Install @effindomv2/runtime or build runtime assets first." >&2
   exit 1
 }
@@ -158,7 +193,8 @@ write_runtime_config() {
 
   cat > "${destination}/${RUNTIME_CONFIG_FILE}" <<EOF
 window.__effindomRuntime = Object.assign({}, window.__effindomRuntime, {
-  manifestUrl: '${manifest_url}',
+  manifestUrl: new URL('${manifest_url}', document.currentScript && document.currentScript.src ? document.currentScript.src : document.baseURI).toString(),
+  buildMode: 'debug',
 });
 EOF
 }
@@ -222,43 +258,6 @@ build_workers() {
   done < <(find_worker_entries)
 }
 
-write_worker_manifest() {
-  local tmp_entries
-  tmp_entries="$(mktemp)"
-  local worker_entry=""
-  while IFS= read -r worker_entry; do
-    [ -n "${worker_entry}" ] || continue
-    local worker_name
-    worker_name="$(basename "${worker_entry}" .ts)"
-    local export_name=""
-    while IFS= read -r export_name; do
-      [ -n "${export_name}" ] || continue
-      if grep -q "^${export_name} " "${tmp_entries}" 2>/dev/null; then
-        echo "Duplicate worker export name: ${export_name}" >&2
-        rm -f "${tmp_entries}"
-        exit 1
-      fi
-      echo "${export_name} ./workers/${worker_name}.wasm" >> "${tmp_entries}"
-    done < <(rg 'export function ([A-Za-z_][A-Za-z0-9_]*)\s*\(' "${worker_entry}" -or '$1')
-  done < <(find_worker_entries)
-
-  {
-    printf '{\n  "version": 1,\n  "entries": {\n'
-    local first=1
-    local line=""
-    sort "${tmp_entries}" | while IFS=' ' read -r entry_name entry_path; do
-      [ -n "${entry_name}" ] || continue
-      if [ "${first}" -eq 0 ]; then
-        printf ',\n'
-      fi
-      first=0
-      printf '    "%s": "%s"' "${entry_name}" "${entry_path}"
-    done
-    printf '\n  }\n}\n'
-  } > "${WORKER_MANIFEST_BUILD}"
-  rm -f "${tmp_entries}"
-}
-
 copy_worker_assets() {
   local destination="$1"
   rm -rf "${destination}/workers"
@@ -273,7 +272,6 @@ copy_worker_assets() {
   cp "${WORKER_BOOTSTRAP_MAP_BUILD}" "${destination}/worker-bootstrap.js.map"
   cp "${WORKER_HOST_SERVICES_BUILD}" "${destination}/worker-host-services.js"
   cp "${WORKER_HOST_SERVICES_MAP_BUILD}" "${destination}/worker-host-services.js.map"
-  cp "${WORKER_MANIFEST_BUILD}" "${destination}/worker-manifest.json"
 }
 
 generate_host_services "demo/src/host-services.ts" "demoHostServices" "demo/src/generated/HostServices.ts"
@@ -287,8 +285,8 @@ build_app "demo/src/routes/demo_home.ts" "${DEMO_OUT_DIR}/home.wasm"
 build_app "demo/src/routes/demo_advanced_controls.ts" "${DEMO_OUT_DIR}/advanced-controls.wasm"
 build_app "demo/src/routes/templated-controls.ts" "${DEMO_OUT_DIR}/templated-controls.wasm"
 build_app "demo/src/routes/demo_scrollbar_gutter.ts" "${DEMO_OUT_DIR}/scrollbar-gutter.wasm"
+build_app "demo/src/routes/demo_immediate_drawing.ts" "${DEMO_OUT_DIR}/immediate-drawing.wasm"
 build_workers
-write_worker_manifest
 
 npx esbuild "${SMOKE_FIXTURE_DIR}/harness.ts" \
   --bundle \
@@ -296,6 +294,7 @@ npx esbuild "${SMOKE_FIXTURE_DIR}/harness.ts" \
   --platform=browser \
   --target=es2020 \
   --minify \
+  "${ESBUILD_RUNTIME_ALIAS_ARGS[@]}" \
   --outfile="${OUT_DIR}/harness.js" \
   --sourcemap
 
@@ -305,15 +304,17 @@ npx esbuild "${PACKAGE_DIR}/demo/harness.ts" \
   --platform=browser \
   --target=es2020 \
   --minify \
+  "${ESBUILD_RUNTIME_ALIAS_ARGS[@]}" \
   --outfile="${DEMO_OUT_DIR}/harness.js" \
   --sourcemap
 
-npx esbuild "${BROWSER_SRC_DIR}/file-processing-worker.ts" \
+npx esbuild "${REPO_ROOT}/v2/browser-bridge/src/managed-harness/file-processing-worker.ts" \
   --bundle \
   --format=iife \
   --platform=browser \
   --target=es2020 \
   --minify \
+  "${ESBUILD_RUNTIME_ALIAS_ARGS[@]}" \
   --outfile="${FILE_PROCESSING_WORKER_BUILD}" \
   --sourcemap
 
@@ -322,12 +323,13 @@ cp "${FILE_PROCESSING_WORKER_MAP_BUILD}" "${OUT_DIR}/file-processing-worker.js.m
 cp "${FILE_PROCESSING_WORKER_BUILD}" "${DEMO_OUT_DIR}/file-processing-worker.js"
 cp "${FILE_PROCESSING_WORKER_MAP_BUILD}" "${DEMO_OUT_DIR}/file-processing-worker.js.map"
 
-npx esbuild "${BROWSER_SRC_DIR}/worker-bootstrap.ts" \
+npx esbuild "${REPO_ROOT}/v2/browser-bridge/src/managed-harness/worker-bootstrap.ts" \
   --bundle \
   --format=iife \
   --platform=browser \
   --target=es2020 \
   --minify \
+  "${ESBUILD_RUNTIME_ALIAS_ARGS[@]}" \
   --outfile="${WORKER_BOOTSTRAP_BUILD}" \
   --sourcemap
 
@@ -346,10 +348,11 @@ cp "${PACKAGE_DIR}/browser/favicon.ico" "${REPO_ROOT}/public/favicon.ico"
 cp "${PACKAGE_DIR}/demo/demo-texture.png" "${DEMO_OUT_DIR}/demo-texture.png"
 cp "${PACKAGE_DIR}/demo/demo-secondary-texture.png" "${DEMO_OUT_DIR}/demo-secondary-texture.png"
 
-mkdir -p "${DEMO_OUT_DIR}/advanced-controls" "${DEMO_OUT_DIR}/templated-controls" "${DEMO_OUT_DIR}/scrollbar-gutter"
+mkdir -p "${DEMO_OUT_DIR}/advanced-controls" "${DEMO_OUT_DIR}/templated-controls" "${DEMO_OUT_DIR}/scrollbar-gutter" "${DEMO_OUT_DIR}/immediate-drawing"
 render_html_with_loading_overlay "${PACKAGE_DIR}/demo/route-shell.html" "${DEMO_OUT_DIR}/advanced-controls/index.html"
 render_html_with_loading_overlay "${PACKAGE_DIR}/demo/route-shell.html" "${DEMO_OUT_DIR}/templated-controls/index.html"
 render_html_with_loading_overlay "${PACKAGE_DIR}/demo/route-shell.html" "${DEMO_OUT_DIR}/scrollbar-gutter/index.html"
+render_html_with_loading_overlay "${PACKAGE_DIR}/demo/route-shell.html" "${DEMO_OUT_DIR}/immediate-drawing/index.html"
 
 copy_runtime_assets "${OUT_DIR}"
 copy_runtime_assets "${DEMO_OUT_DIR}"
@@ -360,3 +363,4 @@ write_runtime_config "${DEMO_OUT_DIR}" "${DEFAULT_MANIFEST_PATH}"
 write_runtime_config "${DEMO_OUT_DIR}/advanced-controls" "../runtime/dist/effindom.v2.manifest.json"
 write_runtime_config "${DEMO_OUT_DIR}/templated-controls" "../runtime/dist/effindom.v2.manifest.json"
 write_runtime_config "${DEMO_OUT_DIR}/scrollbar-gutter" "../runtime/dist/effindom.v2.manifest.json"
+write_runtime_config "${DEMO_OUT_DIR}/immediate-drawing" "../runtime/dist/effindom.v2.manifest.json"

package/scripts/framework-host-services.ts

@@ -1,4 +1,4 @@
-import { defineHostServices, hostService } from "../browser/src/host-services";
+import { defineHostServices, hostService } from "../browser/src/shared-browser";
 
 function unsupported(): never {
   throw new Error("Framework host service definitions are generator metadata only.");