@granite-js/mpack 0.1.6 → 0.1.8

package/dist/operations/{runBundle.js → build.js}

@@ -26,72 +26,72 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var runBundle_exports = {};
-__export(runBundle_exports, {
-  runBundle: () => runBundle
+var build_exports = {};
+__export(build_exports, {
+  build: () => build,
+  buildAll: () => buildAll
 });
-module.exports = __toCommonJS(runBundle_exports);
-var import_assert = __toESM(require("assert"));
+module.exports = __toCommonJS(build_exports);
 var fs = __toESM(require("fs/promises"));
 var path = __toESM(require("path"));
-var import_semaphore = require("@shopify/semaphore");
+var import_plugin_core = require("@granite-js/plugin-core");
 var import_es_toolkit = require("es-toolkit");
-var import__ = require("..");
 var import_bundler = require("../bundler");
 var import_performance = require("../performance");
-var import_loadPresets = require("../utils/loadPresets");
 var import_writeBundle = require("../utils/writeBundle");
-async function runBundle(options) {
-  const config = options.config ?? await (0, import__.loadConfig)({ rootDir: options.rootDir });
-  (0, import_assert.default)(config, "\uAD6C\uC131 \uD30C\uC77C\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4");
-  config.tasks = await Promise.all(
-    config.tasks.map(
-      (task) => (0, import_loadPresets.loadPresets)(task, {
-        appName: config.appName,
-        scheme: config.scheme,
-        rootDir: options.rootDir,
-        dev: options.dev
-      })
-    )
-  );
-  const semaphore = new import_semaphore.Semaphore(config.concurrency ?? 4);
-  const buildResults = await Promise.all(
-    config.tasks.map(async ({ tag, build }) => {
-      if (typeof options.tag === "string" && tag !== options.tag) {
-        return;
-      }
-      const bundler = new import_bundler.Bundler({
-        tag,
-        buildConfig: build,
-        appName: config.appName,
-        scheme: config.scheme,
-        services: config.services,
-        dev: options.dev,
-        metafile: options.metafile,
-        rootDir: options.rootDir,
-        cache: options.cache
-      });
-      if (options.plugins) {
-        options.plugins.forEach((fn) => bundler.addPlugin(fn()));
-      }
-      const permit = await semaphore.acquire();
+async function build({ config, plugins = [], ...options }) {
+  const driver = (0, import_plugin_core.createPluginHooksDriver)(config);
+  await driver.build.pre();
+  const buildResult = await buildImpl(config, plugins, options);
+  await driver.build.post({ buildResults: [buildResult] });
+  return buildResult;
+}
+async function buildAll(optionsList, { config, plugins = [], concurrency = 2 }) {
+  const buildResults = [];
+  const semaphore = new import_es_toolkit.Semaphore(Math.min(concurrency, optionsList.length));
+  const driver = (0, import_plugin_core.createPluginHooksDriver)(config);
+  await driver.build.pre();
+  await Promise.all(
+    optionsList.map(async (options) => {
+      await semaphore.acquire();
       try {
-        const result = await bundler.build();
-        await (0, import_writeBundle.writeBundle)(result.outfile, result.bundle);
-        return result;
-      } finally {
-        await permit.release();
+        const buildResult = await buildImpl(config, plugins, options);
+        buildResults.push(buildResult);
+      } catch {
+        semaphore.release();
       }
     })
-  ).then((results) => results.filter(import_es_toolkit.isNotNil));
+  );
+  await driver.build.post({ buildResults });
+  return buildResults;
+}
+async function buildImpl(config, plugins, { platform, outfile = `bundle.${platform}.js`, cache = true, dev = true, metafile = false }) {
+  const resolvedOutfile = path.join(config.outdir, outfile);
+  const bundler = new import_bundler.Bundler({
+    rootDir: config.cwd,
+    cache,
+    dev,
+    metafile,
+    buildConfig: {
+      platform,
+      outfile: resolvedOutfile,
+      ...config.build
+    }
+  });
+  for (const plugin of plugins) {
+    bundler.addPlugin(plugin());
+  }
+  const buildResult = await bundler.build();
+  await (0, import_writeBundle.writeBundle)(buildResult.outfile, buildResult.bundle);
   const performanceSummary = import_performance.Performance.getSummary();
   if (performanceSummary != null) {
     (0, import_performance.printSummary)(performanceSummary);
-    await fs.writeFile(path.join(options.rootDir, "perf.json"), JSON.stringify(performanceSummary, null, 2), "utf-8");
+    await fs.writeFile(path.join(config.cwd, "perf.json"), JSON.stringify(performanceSummary, null, 2), "utf-8");
   }
-  return buildResults;
+  return buildResult;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  runBundle
+  build,
+  buildAll
 });

package/dist/operations/createDebuggerMiddleware.d.ts

@@ -1,10 +1,9 @@
 import connect from 'connect';
 interface DebuggerMiddlewareConfig {
-    host?: string;
     port: number;
     broadcastMessage: (method: string, params?: Record<string, unknown>) => void;
 }
-export declare function createDebuggerMiddleware({ host, port, broadcastMessage }: DebuggerMiddlewareConfig): {
+export declare function createDebuggerMiddleware({ port, broadcastMessage }: DebuggerMiddlewareConfig): {
     middleware: connect.Server;
     enableStdinWatchMode: () => void;
 };

package/dist/operations/createDebuggerMiddleware.js

@@ -45,7 +45,7 @@ var import_vendors = require("../vendors");
 const debug = (0, import_debug.default)("cli:start");
 const { InspectorProxy } = (0, import_vendors.getModule)("metro-inspector-proxy");
 const chromeInstanceMap = /* @__PURE__ */ new Map();
-function createDebuggerMiddleware({ host, port, broadcastMessage }) {
+function createDebuggerMiddleware({ port, broadcastMessage }) {
   const middleware = (0, import_connect.default)().use(`/${import_constants.DEBUGGER_FRONTEND_PATH}`, (0, import_serve_static.default)(import_path.default.resolve(import_devtools_frontend.default)));
   function enableStdinWatchMode() {
     if (!process.stdout.isTTY || process.stdin.setRawMode == null) {
@@ -80,14 +80,14 @@ function createDebuggerMiddleware({ host, port, broadcastMessage }) {
           broadcastMessage("devMenu");
           break;
         case "j":
-          openReactNativeDebugger(host, port);
+          openReactNativeDebugger(port);
           break;
       }
     });
   }
   return { middleware, enableStdinWatchMode };
 }
-async function openReactNativeDebugger(host = "localhost", port) {
+async function openReactNativeDebugger(port) {
   const connectedDevices = Array.from(InspectorProxy.devices.entries());
   let targetDevice;
   for (const [id, device] of connectedDevices) {
@@ -113,7 +113,7 @@ async function openReactNativeDebugger(host = "localhost", port) {
   }
   console.log(`Opening debugger for '${targetDevice.name}'...`);
   chromeInstanceMap.get(targetDevice.id)?.kill();
-  (0, import_openDebugger.openDebugger)(host, port, targetDevice.id.toString()).then((chrome) => {
+  (0, import_openDebugger.openDebugger)(port, targetDevice.id.toString()).then((chrome) => {
     chromeInstanceMap.set(targetDevice.id, chrome);
   }).catch((error) => {
     if (error.message.includes("ECONNREFUSED")) {

package/dist/operations/experimental/serve.d.ts

@@ -0,0 +1,11 @@
+import { CompleteGraniteConfig } from '@granite-js/plugin-core';
+interface RunServerArgs {
+    config: CompleteGraniteConfig;
+    host?: string;
+    port?: number;
+    onServerReady?: () => Promise<void> | void;
+}
+export declare function EXPERIMENTAL__server({ config, host, port, onServerReady, }: RunServerArgs): Promise<{
+    cleanup: () => Promise<void>;
+}>;
+export {};

package/dist/operations/experimental/{runServer.js → serve.js}

@@ -26,11 +26,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var runServer_exports = {};
-__export(runServer_exports, {
-  experimental_runServer: () => experimental_runServer
+var serve_exports = {};
+__export(serve_exports, {
+  EXPERIMENTAL__server: () => EXPERIMENTAL__server
 });
-module.exports = __toCommonJS(runServer_exports);
+module.exports = __toCommonJS(serve_exports);
+var import_plugin_core = require("@granite-js/plugin-core");
 var import_prompts = require("@inquirer/prompts");
 var import_debug = __toESM(require("debug"));
 var import_StartMenuHandler = require("./StartMenuHandler");
@@ -40,52 +41,47 @@ var import_printLogo = require("../../utils/printLogo");
 var import_openDebugger = require("../openDebugger");
 const debug = (0, import_debug.default)("cli:start");
 const chromeInstanceMap = /* @__PURE__ */ new Map();
-async function experimental_runServer({
-  appName,
-  scheme,
-  devServerConfig,
-  host,
+async function EXPERIMENTAL__server({
+  config,
+  host = import_constants.DEV_SERVER_DEFAULT_HOST,
   port = import_constants.DEV_SERVER_DEFAULT_PORT,
-  plugins,
-  preloadBundle,
   onServerReady
 }) {
-  const rootDir = process.cwd();
+  const driver = (0, import_plugin_core.createPluginHooksDriver)(config);
+  await driver.devServer.pre({ host, port });
+  const rootDir = config.cwd;
   const server = new import_DevServer.DevServer({
-    appName,
-    scheme,
-    build: devServerConfig.build,
-    presets: devServerConfig.presets,
+    buildConfig: config.build,
+    middlewares: config.devServer?.middlewares ?? [],
     host,
     port,
-    preloadBundle,
-    plugins,
     rootDir
   });
   (0, import_printLogo.printLogo)();
   await server.initialize();
   await server.listen();
+  await driver.devServer.post({ host, port });
   await onServerReady?.();
   const menuHandler = new import_StartMenuHandler.StartMenuHandler([
     {
       key: "r",
-      description: "\uC0C8\uB85C\uACE0\uCE68",
+      description: "Refresh",
       action: () => {
-        console.log("\uC0C8\uB85C\uACE0\uCE68 \uC911...");
+        console.log("Refreshing...");
         server.broadcastCommand("reload");
       }
     },
     {
       key: "d",
-      description: "\uAC1C\uBC1C\uC790 \uBA54\uB274 \uC5F4\uAE30",
+      description: "Open Developer Menu",
       action: () => {
-        console.log("\uAC1C\uBC1C\uC790 \uBA54\uB274 \uC5EC\uB294 \uC911...");
+        console.log("Opening developer menu...");
         server.broadcastCommand("devMenu");
       }
     },
     {
       key: "j",
-      description: "Debugger \uC5F4\uAE30",
+      description: "Open Debugger",
       action: async () => {
         const devices = server.getInspectorProxy()?.getDevices();
         const connectedDevices = Array.from(devices?.entries() ?? []);
@@ -113,7 +109,7 @@ async function experimental_runServer({
         }
         console.log(`Opening debugger for '${targetDevice.name}'...`);
         chromeInstanceMap.get(targetDevice.id)?.kill();
-        (0, import_openDebugger.openDebugger)(server.host, server.port, targetDevice.id).then((chrome) => {
+        (0, import_openDebugger.openDebugger)(server.port, targetDevice.id).then((chrome) => {
           chromeInstanceMap.set(targetDevice.id, chrome);
         }).catch((error) => {
           if (error.message.includes("ECONNREFUSED")) {
@@ -133,5 +129,5 @@ async function experimental_runServer({
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  experimental_runServer
+  EXPERIMENTAL__server
 });

package/dist/operations/index.d.ts

@@ -1,3 +1,3 @@
-export * from './runBundle';
-export * from './runServer';
-export * from './experimental/runServer';
+export * as BuildUtils from './build';
+export * from './serve';
+export * from './experimental/serve';

package/dist/operations/index.js

@@ -1,8 +1,14 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -12,15 +18,26 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var operations_exports = {};
+__export(operations_exports, {
+  BuildUtils: () => BuildUtils
+});
 module.exports = __toCommonJS(operations_exports);
-__reExport(operations_exports, require("./runBundle"), module.exports);
-__reExport(operations_exports, require("./runServer"), module.exports);
-__reExport(operations_exports, require("./experimental/runServer"), module.exports);
+var BuildUtils = __toESM(require("./build"));
+__reExport(operations_exports, require("./serve"), module.exports);
+__reExport(operations_exports, require("./experimental/serve"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ...require("./runBundle"),
-  ...require("./runServer"),
-  ...require("./experimental/runServer")
+  BuildUtils,
+  ...require("./serve"),
+  ...require("./experimental/serve")
 });

package/dist/operations/openDebugger.d.ts

@@ -1 +1 @@
-export declare function openDebugger(host: string | undefined, port: number, deviceId: string): Promise<import("chrome-launcher").LaunchedChrome>;
+export declare function openDebugger(port: number, deviceId: string): Promise<import("chrome-launcher").LaunchedChrome>;

package/dist/operations/openDebugger.js

@@ -36,8 +36,9 @@ var os = __toESM(require("os"));
 var path = __toESM(require("path"));
 var import_chrome_launcher = require("chrome-launcher");
 var import_constants = require("./constants");
-async function openDebugger(host = "localhost", port, deviceId) {
-  const appUrl = getDevToolsFrontendUrl(host, port, deviceId);
+const DEBUGGER_HOST = "localhost";
+async function openDebugger(port, deviceId) {
+  const appUrl = getDevToolsFrontendUrl(DEBUGGER_HOST, port, deviceId);
   const tempDir = await createTemporaryDirectory();
   const chromePath = (0, import_chrome_launcher.getChromePath)();
   if (!chromePath) {

package/dist/operations/serve.d.ts

@@ -0,0 +1,10 @@
+import { type CompleteGraniteConfig } from '@granite-js/plugin-core';
+interface RunServerConfig {
+    config: CompleteGraniteConfig;
+    host?: string;
+    port?: number;
+    enableEmbeddedReactDevTools?: boolean;
+    onServerReady?: () => Promise<void> | void;
+}
+export declare function runServer({ config, host, port, enableEmbeddedReactDevTools, onServerReady, }: RunServerConfig): Promise<void>;
+export {};

package/dist/operations/{runServer.js → serve.js}

@@ -26,18 +26,18 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var runServer_exports = {};
-__export(runServer_exports, {
+var serve_exports = {};
+__export(serve_exports, {
   runServer: () => runServer
 });
-module.exports = __toCommonJS(runServer_exports);
+module.exports = __toCommonJS(serve_exports);
+var import_plugin_core = require("@granite-js/plugin-core");
 var import_cli_server_api = require("@react-native-community/cli-server-api");
 var import_debug = __toESM(require("debug"));
 var import_backend = require("react-native-devtools-standalone/backend");
 var import_createDebuggerMiddleware = require("./createDebuggerMiddleware");
 var import_constants = require("../constants");
 var import_getMetroConfig = require("../metro/getMetroConfig");
-var import_loadConfig = require("../utils/loadConfig");
 var import_printLogo = require("../utils/printLogo");
 var import_vendors = require("../vendors");
 const debug = (0, import_debug.default)("cli:start");
@@ -45,17 +45,14 @@ const { Metro, TerminalReporter } = (0, import_vendors.getModule)("metro");
 const { Terminal } = (0, import_vendors.getModule)("metro-core");
 const { mergeConfig } = (0, import_vendors.getModule)("metro-config");
 async function runServer({
-  host,
+  config,
+  host = import_constants.DEV_SERVER_DEFAULT_HOST,
   port = import_constants.DEV_SERVER_DEFAULT_PORT,
-  middlewares = [],
   enableEmbeddedReactDevTools = true,
-  onServerReady,
-  cwd = process.cwd(),
-  config: $config,
-  additionalConfig
+  onServerReady
 }) {
-  const config = $config ?? await (0, import_loadConfig.loadConfig)({ rootDir: cwd });
   const ref = {};
+  const driver = (0, import_plugin_core.createPluginHooksDriver)(config);
   const terminal = new Terminal(process.stdout);
   const terminalReporter = new TerminalReporter(terminal);
   const reporter = {
@@ -63,12 +60,16 @@ async function runServer({
       debug("Reporter event", event);
       terminalReporter.update(event);
       ref.reportEvent?.(event);
+      if (baseConfig.reporter?.update) {
+        baseConfig.reporter.update(event);
+      }
       switch (event.type) {
         case "initialize_started":
           (0, import_printLogo.printLogo)();
           break;
         case "initialize_done":
           enableStdinWatchMode();
+          await driver.devServer.post({ host, port });
           await onServerReady?.();
           break;
         default:
@@ -76,10 +77,8 @@ async function runServer({
       }
     }
   };
-  const baseConfig = await (0, import_getMetroConfig.getMetroConfig)(
-    { rootPath: cwd, appName: config?.appName ?? "", scheme: config?.scheme ?? "" },
-    additionalConfig
-  );
+  const { middlewares = [], ...additionalMetroConfig } = config.metro ?? {};
+  const baseConfig = await (0, import_getMetroConfig.getMetroConfig)({ rootPath: config.cwd }, additionalMetroConfig);
   const metroConfig = mergeConfig(baseConfig, {
     server: { port },
     reporter
@@ -90,7 +89,6 @@ async function runServer({
     watchFolders: metroConfig.watchFolders
   });
   const { middleware: debuggerMiddleware, enableStdinWatchMode } = (0, import_createDebuggerMiddleware.createDebuggerMiddleware)({
-    host,
     port,
     broadcastMessage: messageSocketEndpoint.broadcast
   });
@@ -122,6 +120,7 @@ async function runServer({
   }
   ref.reportEvent = eventsSocketEndpoint.reportEvent;
   ref.enableStdinWatchMode = enableStdinWatchMode;
+  await driver.devServer.pre({ host, port });
   const serverInstance = await Metro.runServer(metroConfig, {
     host,
     websocketEndpoints

package/dist/plugins/statusPlugin.js

@@ -34,7 +34,7 @@ function statusPlugin(handlers) {
       if (progressBar != null) {
         return;
       }
-      progressBar = (0, import_progressBar.createProgressBar)(`${config.appName}:${config.buildConfig.platform}`);
+      progressBar = (0, import_progressBar.createProgressBar)(config.buildConfig.platform);
       totalModuleCount = import_PersistentStorage.persistentStorage.getData()[this.id]?.totalModuleCount;
     },
     buildStart() {

package/dist/server/DevServer.d.ts

@@ -21,3 +21,6 @@ export declare class DevServer {
     private createDevServerContext;
     private getBundle;
 }
+declare global {
+    var remoteBundles: Record<'android' | 'ios', string> | null;
+}

package/dist/server/DevServer.js

@@ -32,7 +32,6 @@ __export(DevServer_exports, {
 });
 module.exports = __toCommonJS(DevServer_exports);
 var import_assert = __toESM(require("assert"));
-var fs = __toESM(require("fs/promises"));
 var import_fastify = __toESM(require("fastify"));
 var import_backend = require("react-native-devtools-standalone/backend");
 var import_DebuggerEventHandler = require("./debugger/DebuggerEventHandler");
@@ -73,9 +72,9 @@ class DevServer {
   wssDelegate;
   async initialize() {
     import_logger.logger.trace("DevServer.initialize");
-    const { rootDir, appName, scheme, ...devServerConfig } = this.devServerOptions;
+    const { rootDir, buildConfig } = this.devServerOptions;
     await import_PersistentStorage.persistentStorage.loadData();
-    this.context = await this.createDevServerContext(rootDir, appName, scheme, devServerConfig);
+    this.context = await this.createDevServerContext(rootDir, buildConfig);
   }
   listen() {
     import_logger.logger.trace("DevServer.listen");
@@ -135,7 +134,7 @@ class DevServer {
       }
     });
     app.register(serverPlugins.statusPlugin, { rootDir: this.devServerOptions.rootDir }).register(serverPlugins.debuggerPlugin, { onReload: () => this.wssDelegate?.broadcastCommand("reload") }).register(serverPlugins.serveBundlePlugin, { getBundle: this.getBundle.bind(this) }).register(serverPlugins.symbolicatePlugin, { getBundle: this.getBundle.bind(this) }).register(serverPlugins.indexPagePlugin).addHook("onRequest", inspectorProxy.handleRequest).addHook("onSend", this.setCommonHeaders);
-    for (const plugin of this.devServerOptions.plugins ?? []) {
+    for (const plugin of this.devServerOptions.middlewares ?? []) {
       app.register(plugin);
     }
     new import_wss.WebSocketServerRouter().register("/hot", liveReloadMiddleware.server).register("/debugger-proxy", debuggerProxySocket.server).register("/message", messageSocket.server).register("/events", eventsSocket.server).register("/inspector/device", inspectorProxyWss.deviceSocketServer).register("/inspector/debug", inspectorProxyWss.debuggerSocketServer).setup(app);
@@ -161,10 +160,10 @@ class DevServer {
     reply.header("Expires", "0");
     next();
   }
-  async createDevServerContext(rootDir, appName, scheme, config) {
+  async createDevServerContext(rootDir, buildConfig) {
     const [androidBundler, iosBundler] = await Promise.all([
-      (0, import_createBundlerForDevServer.createDevServerForDevServer)({ rootDir, appName, scheme, platform: "android", config }),
-      (0, import_createBundlerForDevServer.createDevServerForDevServer)({ rootDir, appName, scheme, platform: "ios", config })
+      (0, import_createBundlerForDevServer.createBundlerForDevServer)({ rootDir, platform: "android", buildConfig }),
+      (0, import_createBundlerForDevServer.createBundlerForDevServer)({ rootDir, platform: "ios", buildConfig })
     ]);
     [androidBundler, iosBundler].forEach((bundler) => {
       bundler.addPlugin(
@@ -180,15 +179,14 @@ class DevServer {
       );
     });
     return {
-      config,
       rootDir,
       android: {
         bundler: androidBundler,
-        progressBar: (0, import_progressBar.createProgressBar)(`${appName}:android`)
+        progressBar: (0, import_progressBar.createProgressBar)("android")
       },
       ios: {
         bundler: iosBundler,
-        progressBar: (0, import_progressBar.createProgressBar)(`${appName}:ios`)
+        progressBar: (0, import_progressBar.createProgressBar)("ios")
       }
     };
   }
@@ -196,12 +194,13 @@ class DevServer {
     const { bundler } = this.getContext()[platform];
     const { bundle } = await bundler.build({ withDispose: false });
     let targetBundle;
-    if (this.devServerOptions.preloadBundle != null) {
-      const sharedBundleContent = await fs.readFile(this.devServerOptions.preloadBundle, "utf-8");
+    if (globalThis.remoteBundles != null) {
+      const hostBundleContent = bundle.source.text;
+      const remoteBundleContent = globalThis.remoteBundles[platform];
       const mergedBundle = await (0, import_mergeBundles.mergeBundles)({
         platform,
-        preloadedBundleContent: sharedBundleContent,
-        mainBundle: bundle
+        hostBundleContent,
+        remoteBundleContent
       });
       targetBundle = mergedBundle;
     } else {

package/dist/server/helpers/createBundlerForDevServer.d.ts

@@ -1,10 +1,8 @@
+import type { BuildConfig } from '@granite-js/plugin-core';
 import { Bundler } from '../../bundler';
-import { DevServerConfig } from '../../types';
 import { Platform } from '../types';
-export declare function createDevServerForDevServer({ rootDir, appName, scheme, platform, config, }: {
+export declare function createBundlerForDevServer({ rootDir, platform, buildConfig, }: {
     rootDir: string;
-    appName: string;
-    scheme: string;
     platform: Platform;
-    config: DevServerConfig;
+    buildConfig: Omit<BuildConfig, 'outfile' | 'platform'>;
 }): Promise<Bundler>;

package/dist/server/helpers/createBundlerForDevServer.js

@@ -18,58 +18,31 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var createBundlerForDevServer_exports = {};
 __export(createBundlerForDevServer_exports, {
-  createDevServerForDevServer: () => createDevServerForDevServer
+  createBundlerForDevServer: () => createBundlerForDevServer
 });
 module.exports = __toCommonJS(createBundlerForDevServer_exports);
 var import_bundler = require("../../bundler");
 var import_getBundleName = require("../../utils/getBundleName");
-var import_loadPresets = require("../../utils/loadPresets");
 var import_constants = require("../constants");
-async function createDevServerForDevServer({
+async function createBundlerForDevServer({
   rootDir,
-  appName,
-  scheme,
   platform,
-  config
+  buildConfig
 }) {
-  const tag = "dev-server";
-  const dev = true;
   const bundleName = (0, import_getBundleName.getBundleName)(import_constants.DEV_SERVER_BUNDLE_NAME);
-  const { build } = await (0, import_loadPresets.loadPresets)(
-    {
-      tag,
-      presets: config.presets,
-      build: {
-        ...config.build,
-        platform,
-        outfile: bundleName
-      }
-    },
-    {
-      rootDir,
-      appName,
-      scheme,
-      dev
-    }
-  );
-  const bundler = new import_bundler.Bundler({
-    tag,
+  return new import_bundler.Bundler({
     rootDir,
-    appName,
-    scheme,
-    dev,
+    dev: true,
     cache: true,
     metafile: false,
-    buildConfig: build,
-    services: {
-      sentry: {
-        enabled: false
-      }
+    buildConfig: {
+      ...buildConfig,
+      platform,
+      outfile: bundleName
     }
   });
-  return bundler;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createDevServerForDevServer
+  createBundlerForDevServer
 });

package/dist/server/helpers/mergeBundles.d.ts

@@ -1,7 +1,7 @@
-import { BundleData } from '../../bundler/types';
+import type { BundleData } from '@granite-js/plugin-core';
 import { Platform } from '../types';
-export declare function mergeBundles({ platform, preloadedBundleContent, mainBundle, }: {
+export declare function mergeBundles({ platform, hostBundleContent, remoteBundleContent, }: {
     platform: Platform;
-    preloadedBundleContent: string;
-    mainBundle: BundleData;
+    hostBundleContent: string;
+    remoteBundleContent: string;
 }): Promise<BundleData>;