@granite-js/mpack 0.1.6 → 0.1.8

package/dist/server/helpers/mergeBundles.js

@@ -37,18 +37,18 @@ var import_getBundleName = require("../../utils/getBundleName");
 var import_getSourcemapName = require("../../utils/getSourcemapName");
 var import_constants2 = require("../constants");
 const INTERNAL_SOURCE = "mpack:internal";
-const IMPORT_SOURCE = "mpack:main-bundle";
+const IMPORT_SOURCE = "mpack:remote";
 async function mergeBundles({
   platform,
-  preloadedBundleContent,
-  mainBundle
+  hostBundleContent,
+  remoteBundleContent
 }) {
   const bundleName = (0, import_getBundleName.getBundleName)(import_constants2.DEV_SERVER_BUNDLE_NAME);
   const sourcemapName = (0, import_getSourcemapName.getSourcemapName)(bundleName);
   const result = await esbuild.build({
     logLevel: "silent",
     stdin: {
-      contents: [`require('${INTERNAL_SOURCE}');`, preloadedBundleContent].join("\n"),
+      contents: [`require('${INTERNAL_SOURCE}');`, hostBundleContent].join("\n"),
       loader: "js"
     },
     outfile: bundleName,
@@ -78,21 +78,21 @@ async function mergeBundles({
     },
     plugins: [
       {
-        name: "main-bundle-loader",
+        name: "remote-bundle-loader",
         setup(build) {
           build.onResolve({ filter: new RegExp(`^${INTERNAL_SOURCE}$`) }, () => ({
             path: "dev-server-runtime",
             namespace: "DEV_SERVER_RUNTIME"
           }));
           build.onResolve({ filter: new RegExp(`^${IMPORT_SOURCE}$`) }, () => ({
-            path: "main-bundle",
-            namespace: "MAIN_BUNDLE"
+            path: "remote-bundle",
+            namespace: "REMOTE_BUNDLE"
           }));
           build.onLoad({ filter: /.*/, namespace: "DEV_SERVER_RUNTIME" }, () => ({
             contents: `
             (function(global) {
               global.${import_constants.INTERNAL_NAMESPACE_IDENTIFIER} = {};
-              global.${import_constants.INTERNAL_NAMESPACE_IDENTIFIER}.${import_constants.INTERNAL_EVALUATE_MAIN_BUNDLE_IDENTIFIER} = function INTERNAL__evaluateMainBundle() {
+              global.${import_constants.INTERNAL_NAMESPACE_IDENTIFIER}.${import_constants.INTERNAL_LOAD_REMOTE_IDENTIFIER} = function INTERNAL__loadRemote() {
                 require('${IMPORT_SOURCE}');
                 return Promise.resolve();
               }
@@ -108,8 +108,8 @@ async function mergeBundles({
             `,
             loader: "js"
           }));
-          build.onLoad({ filter: /.*/, namespace: "MAIN_BUNDLE" }, () => ({
-            contents: mainBundle.source.text,
+          build.onLoad({ filter: /.*/, namespace: "REMOTE_BUNDLE" }, () => ({
+            contents: remoteBundleContent,
             loader: "js"
           }));
         }

package/dist/server/plugins/serveBundlePlugin.d.ts

@@ -1,5 +1,5 @@
-import { FastifyInstance } from 'fastify';
-import { BundleData } from '../../bundler/types';
+import type { BundleData } from '@granite-js/plugin-core';
+import type { FastifyInstance } from 'fastify';
 import type { Platform } from '../types';
 declare function _serveBundlePlugin(app: FastifyInstance, { getBundle }: {
     getBundle: (platform: Platform) => Promise<BundleData>;

package/dist/server/plugins/symbolicatePlugin/symbolicatePlugin.d.ts

@@ -1,5 +1,5 @@
-import { FastifyInstance } from 'fastify';
-import { BundleData } from '../../../bundler/types';
+import type { BundleData } from '@granite-js/plugin-core';
+import type { FastifyInstance } from 'fastify';
 import type { Platform } from '../../types';
 declare function symbolicatePluginImpl(app: FastifyInstance, { getBundle }: {
     getBundle: (platform: Platform) => Promise<BundleData>;

package/dist/server/types.d.ts

@@ -1,20 +1,16 @@
-import type { FastifyPluginAsync, FastifyPluginCallback } from 'fastify';
+import type { Middleware, BuildConfig } from '@granite-js/plugin-core';
 import type { Bundler } from '../bundler';
-import type { DevServerConfig } from '../types';
 import type { BuildStatusProgressBar } from '../utils/progressBar';
 export type Platform = 'android' | 'ios';
-export interface DevServerOptions extends DevServerConfig {
+export interface DevServerOptions {
     rootDir: string;
-    appName: string;
-    scheme: string;
-    preloadBundle?: string;
     host?: string;
     port?: number;
-    plugins?: DevServerPlugin[];
+    buildConfig: Omit<BuildConfig, 'platform' | 'outfile'>;
+    middlewares?: Middleware[];
 }
 export interface DevServerContext {
     rootDir: string;
-    config: DevServerConfig;
     android: {
         bundler: Bundler;
         progressBar: BuildStatusProgressBar;
@@ -24,14 +20,14 @@ export interface DevServerContext {
         progressBar: BuildStatusProgressBar;
     };
 }
-type ClientLogLevel = 'trace' | 'info' | 'warn'
+type ClientLogLevel = 'trace' | 'info' | 'warn' | 'log' | 'group' | 'groupCollapsed' | 'groupEnd' | 'debug'
 /**
- * React Native 에는 ReportableEvent['level'] 에 `error` 타입이 정의되어있지 않은데,
- * Flipper 에서는 error 타입을 지원하기에 이를 추가함.
+ * In React Native, `error` type is not defined in ReportableEvent['level'],
+ * Flipper supports `error` type, so we add it.
  *
  * @see {@link https://github.com/facebook/flipper/blob/v0.211.0/desktop/flipper-common/src/server-types.tsx#L76}
  */
- | 'error' | 'log' | 'group' | 'groupCollapsed' | 'groupEnd' | 'debug';
+ | 'error';
 /**
  * @see {@link https://github.com/facebook/metro/blob/v0.78.0/packages/metro/src/lib/reporting.js#L36}
  */
@@ -42,7 +38,7 @@ export interface ClientLogEvent {
     mode: 'BRIDGE' | 'NOBRIDGE';
 }
 /**
- * HMR 웹소켓 메시지 타입
+ * HMR WebSocket message type
  *
  * @see {@link https://github.com/facebook/metro/blob/v0.77.0/packages/metro-runtime/src/modules/types.flow.js#L68}
  */
@@ -93,5 +89,4 @@ export type BroadcastCommand = 'reload' | 'devMenu';
 export interface MessageBroadcaster {
     (command: BroadcastCommand, params?: Record<string, unknown>): void;
 }
-export type DevServerPlugin = FastifyPluginCallback | FastifyPluginAsync;
 export {};

package/dist/types/BundlerConfig.d.ts

@@ -1,21 +1,9 @@
-import { BuildConfig } from './BuildConfig';
+import type { BuildConfig } from '@granite-js/plugin-core';
 export interface BundlerConfig {
-    /**
-     * Task indentifier
-     */
-    tag: string;
     /**
      * Project root path
      */
     rootDir: string;
-    /**
-     * Application name
-     */
-    appName: string;
-    /**
-     * Scheme prefix
-     */
-    scheme: string;
     /**
      * Development mode
      */
@@ -32,25 +20,4 @@ export interface BundlerConfig {
      * Build configuration
      */
     buildConfig: BuildConfig;
-    /**
-     * @deprecated
-     *
-     * Configuration for integrating external services
-     */
-    services?: ServiceConfig;
-}
-interface ServiceConfig {
-    sentry?: {
-        /**
-         * Defaults to `true`
-         */
-        enabled?: boolean;
-        /**
-         * Defaults to `process.env.SENTRY_AUTH_TOKEN`
-         */
-        authToken?: string;
-        org?: string;
-        project?: string;
-    };
 }
-export {};

package/dist/types/Id.d.ts

@@ -0,0 +1,3 @@
+export type INTERNAL__Id = string & {
+    __id: true;
+};

package/dist/{bundler/types.js → types/Id.js}

@@ -12,5 +12,5 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var types_exports = {};
-module.exports = __toCommonJS(types_exports);
+var Id_exports = {};
+module.exports = __toCommonJS(Id_exports);

package/dist/types/Plugin.d.ts

@@ -1,5 +1,5 @@
-import type { INTERNAL__Id } from './TaskConfig';
-import type { BuildResult } from '../bundler/types';
+import type { BuildResult } from '@granite-js/plugin-core';
+import type { INTERNAL__Id } from './Id';
 import type { BundlerConfig } from '../types/BundlerConfig';
 export interface Plugin extends Partial<BindThis<PluginHooks, PluginContext>> {
     name?: string;

package/dist/types/index.d.ts

@@ -1,9 +1,3 @@
-export * from './BuildConfig';
 export * from './BundlerConfig';
-export * from './Config';
-export * from './DevServerConfig';
 export * from './Plugin';
-export * from './PresetContext';
-export * from './ServicesConfig';
-export * from './TaskConfig';
-export * from './Preset';
+export * from './Id';

package/dist/types/index.js

@@ -15,24 +15,12 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var types_exports = {};
 module.exports = __toCommonJS(types_exports);
-__reExport(types_exports, require("./BuildConfig"), module.exports);
 __reExport(types_exports, require("./BundlerConfig"), module.exports);
-__reExport(types_exports, require("./Config"), module.exports);
-__reExport(types_exports, require("./DevServerConfig"), module.exports);
 __reExport(types_exports, require("./Plugin"), module.exports);
-__reExport(types_exports, require("./PresetContext"), module.exports);
-__reExport(types_exports, require("./ServicesConfig"), module.exports);
-__reExport(types_exports, require("./TaskConfig"), module.exports);
-__reExport(types_exports, require("./Preset"), module.exports);
+__reExport(types_exports, require("./Id"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ...require("./BuildConfig"),
   ...require("./BundlerConfig"),
-  ...require("./Config"),
-  ...require("./DevServerConfig"),
   ...require("./Plugin"),
-  ...require("./PresetContext"),
-  ...require("./ServicesConfig"),
-  ...require("./TaskConfig"),
-  ...require("./Preset")
+  ...require("./Id")
 });

package/dist/utils/getId.js

@@ -25,14 +25,7 @@ var import_md5 = require("./md5");
 var import_constants = require("../constants");
 function getId(bundleConfig) {
   return (0, import_md5.md5)(
-    JSON.stringify([
-      import_constants.VERSION,
-      bundleConfig.appName,
-      bundleConfig.rootDir,
-      bundleConfig.dev,
-      bundleConfig.services,
-      bundleConfig.buildConfig
-    ])
+    JSON.stringify([import_constants.VERSION, bundleConfig.rootDir, bundleConfig.dev, bundleConfig.buildConfig])
   );
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/utils/progressBar.d.ts

@@ -1,4 +1,4 @@
-import type { BuildResult } from '../bundler/types';
+import type { BuildResult } from '@granite-js/plugin-core';
 export interface BuildStatusProgressBar {
     start: (moduleCount: number, totalModuleCount: number) => void;
     update: (moduleCount: number, totalModuleCount?: number) => void;

package/dist/utils/writeBundle.d.ts

@@ -1,2 +1,2 @@
-import type { BundleData } from '../bundler/types';
+import type { BundleData } from '@granite-js/plugin-core';
 export declare function writeBundle(outputPath: string, { source, sourcemap }: BundleData): Promise<void>;

package/dist/vendors/metro/src/lib/ReportableEvent.d.ts

@@ -0,0 +1,152 @@
+interface BundleDetails {
+  bundleType: string;
+  dev: boolean;
+  entryFile: string;
+  minify: boolean;
+  platform?: string;
+  runtimeBytecodeVersion?: number;
+}
+
+type WatcherStatus =
+| {
+    type: 'watchman_slow_command';
+    timeElapsed: number;
+    command: 'watch-project' | 'query';
+}
+| {
+    type: 'watchman_slow_command_complete';
+    timeElapsed: number;
+    command: 'watch-project' | 'query';
+}
+| {
+    type: 'watchman_warning';
+    warning: unknown;
+    command: 'watch-project' | 'query';
+};
+
+type HealthCheckResult =
+  | {type: 'error'; timeout: number; error: Error; watcher: string | null}
+  | {
+      type: 'success';
+      timeout: number;
+      timeElapsed: number;
+      watcher: string | null;
+    }
+  | {
+      type: 'timeout';
+      timeout: number;
+      watcher: string | null;
+      pauseReason: string | null;
+    };
+
+export type ReportableEvent =
+  | {
+      port: number;
+      hasReducedPerformance: boolean;
+      type: 'initialize_started';
+    }
+  | {
+      type: 'initialize_failed';
+      port: number;
+      error: Error;
+    }
+  | {
+      type: 'initialize_done';
+      port: number;
+    }
+  | {
+      buildID: string;
+      type: 'bundle_build_done';
+    }
+  | {
+      buildID: string;
+      type: 'bundle_build_failed';
+    }
+  | {
+      type: 'bundle_save_log';
+      message: string;
+    }
+  | {
+      buildID: string;
+      bundleDetails: BundleDetails;
+      isPrefetch?: boolean;
+      type: 'bundle_build_started';
+    }
+  | {
+      error: Error;
+      type: 'bundling_error';
+    }
+  | {
+      type: 'dep_graph_loading';
+      hasReducedPerformance: boolean;
+    }
+  | {type: 'dep_graph_loaded'}
+  | {
+      buildID: string;
+      type: 'bundle_transform_progressed';
+      transformedFileCount: number;
+      totalFileCount: number;
+    }
+  | {
+      type: 'cache_read_error';
+      error: Error;
+    }
+  | {
+      type: 'cache_write_error';
+      error: Error;
+    }
+  | {type: 'transform_cache_reset'}
+  | {
+      type: 'worker_stdout_chunk';
+      chunk: string;
+    }
+  | {
+      type: 'worker_stderr_chunk';
+      chunk: string;
+    }
+  | {
+      type: 'hmr_client_error';
+      error: Error;
+    }
+  | {
+      type: 'client_log';
+      level:
+        | 'trace'
+        | 'info'
+        | 'warn'
+        | 'log'
+        | 'group'
+        | 'groupCollapsed'
+        | 'groupEnd'
+        | 'debug';
+      data: Array<unknown>;
+      mode: 'BRIDGE' | 'NOBRIDGE';
+    }
+  | {
+      type: 'resolver_warning';
+      message: string;
+    }
+  | {
+      type: 'server_listening';
+      port: number;
+      address: string;
+      family: string;
+    }
+  | {
+      type: 'transformer_load_started';
+    }
+  | {
+      type: 'transformer_load_done';
+    }
+  | {
+      type: 'transformer_load_failed';
+      error: Error;
+    }
+  | {
+      type: 'watcher_health_check_result';
+      result: HealthCheckResult;
+    }
+  | {
+      type: 'watcher_status';
+      status: WatcherStatus;
+    };

package/dist/vendors/metro/src/lib/TerminalReporter.d.ts

@@ -1,5 +1,5 @@
+import type { ReportableEvent } from "./ReportableEvent";
 type Terminal = any;
-type ReportableEvent = any;
 type TerminalReportableEvent =
   | ReportableEvent
   | {
@@ -15,4 +15,4 @@ declare class TerminalReporter {
   update(event: TerminalReportableEvent): void;
 }
 
-export default TerminalReporter;
+export default TerminalReporter;

package/dist/vendors/metro-transform-worker/src/index.js

@@ -359,7 +359,6 @@ function getBabelTransformArgs(file, { options, config, projectRoot }) {
     // MARK: - GRANITE
     ...additionalBabelConfig,
     plugins: additionalBabelConfig?.plugins ?? [],
-    filename: file.filename,
     src: file.code
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@granite-js/mpack",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "A bundler for Granite apps",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -83,8 +83,9 @@
     "@babel/traverse": "^7.14.0",
     "@babel/types": "^7.0.0",
     "@fastify/static": "7.0.1",
-    "@granite-js/devtools-frontend": "0.1.6",
-    "@granite-js/utils": "0.1.6",
+    "@granite-js/devtools-frontend": "0.1.8",
+    "@granite-js/plugin-core": "0.1.8",
+    "@granite-js/utils": "0.1.8",
     "@inquirer/prompts": "^7.2.3",
     "@react-native-community/cli-plugin-metro": "11.3.7",
     "@react-native-community/cli-server-api": "11.3.7",
@@ -110,7 +111,7 @@
     "enhanced-resolve": "^5.17.1",
     "error-stack-parser": "^2.0.6",
     "es-toolkit": "^1.26.1",
-    "esbuild": "^0.25.4",
+    "esbuild": "0.25.8",
     "events": "3.3.0",
     "fastify": "4.14.0",
     "fastify-plugin": "4.5.1",

package/dist/bundler/types.d.ts

@@ -1,17 +0,0 @@
-import * as esbuild from 'esbuild';
-import type { BuildConfig } from '..';
-export type BuildResult = esbuild.BuildResult & {
-    tag: string;
-    bundle: BundleData;
-    outfile: BuildConfig['outfile'];
-    sourcemapOutfile: NonNullable<BuildConfig['sourcemapOutfile']>;
-    platform: BuildConfig['platform'];
-    extra: BuildConfig['extra'];
-    totalModuleCount: number;
-    duration: number;
-    size: number;
-};
-export interface BundleData {
-    source: esbuild.OutputFile;
-    sourcemap: esbuild.OutputFile;
-}

package/dist/metro/runBuild.d.ts

@@ -1,12 +0,0 @@
-import type { MetroConfig } from './types';
-export declare function runBuild({ appName, scheme, rootPath, entry, platform, minify, out, dev, additionalConfig, }: {
-    appName: string;
-    scheme: string;
-    rootPath: string;
-    entry: string;
-    platform: 'ios' | 'android';
-    minify: boolean;
-    out: string;
-    dev: boolean;
-    additionalConfig?: MetroConfig;
-}): Promise<void>;

package/dist/metro/runBuild.js

@@ -1,66 +0,0 @@
-"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))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-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 runBuild_exports = {};
-__export(runBuild_exports, {
-  runBuild: () => runBuild
-});
-module.exports = __toCommonJS(runBuild_exports);
-var import_getMetroConfig = require("./getMetroConfig");
-var import_src = __toESM(require("../vendors/metro/src"));
-async function runBuild({
-  appName,
-  scheme,
-  rootPath,
-  entry,
-  platform,
-  minify,
-  out,
-  dev,
-  additionalConfig
-}) {
-  const config = await (0, import_getMetroConfig.getMetroConfig)(
-    {
-      appName,
-      rootPath,
-      scheme
-    },
-    additionalConfig
-  );
-  await import_src.default.runBuild(config, {
-    entry,
-    platform,
-    minify,
-    out,
-    dev
-  });
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  runBuild
-});

package/dist/metro/runtime.d.ts

@@ -1,3 +0,0 @@
-export declare function writeEnvScript(rootPath: string, appName: string, scheme: string): Promise<{
-    path: string;
-}>;

package/dist/metro/runtime.js

@@ -1,56 +0,0 @@
-"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))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-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 runtime_exports = {};
-__export(runtime_exports, {
-  writeEnvScript: () => writeEnvScript
-});
-module.exports = __toCommonJS(runtime_exports);
-var import_promises = __toESM(require("fs/promises"));
-var import_path = __toESM(require("path"));
-async function writeEnvScript(rootPath, appName, scheme) {
-  const script = getEnvScript(appName, scheme);
-  const basePath = import_path.default.join(rootPath, ".granite");
-  const filePath = import_path.default.join(basePath, ".env.js");
-  await import_promises.default.access(basePath).catch(() => import_promises.default.mkdir(basePath));
-  await import_promises.default.writeFile(filePath, script, { encoding: "utf-8" });
-  return { path: filePath };
-}
-function getEnvScript(appName, scheme) {
-  const buildNumber = "00000000";
-  const script = [
-    "global.__granite = global.__granite || {};",
-    `global.__granite.shared = { buildNumber: ${JSON.stringify(buildNumber)} };`,
-    `global.__granite.app = { name: ${appName.startsWith("babel:") ? appName.slice(6) : JSON.stringify(appName)}, scheme: ${JSON.stringify(scheme)}, buildNumber: ${JSON.stringify(buildNumber)} };`
-  ].join("\n");
-  return script;
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  writeEnvScript
-});