@granite-js/mpack 0.1.16 → 0.1.18

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @granite-js/mpack
 
+## 0.1.18
+
+### Patch Changes
+
+- @granite-js/devtools-frontend@0.1.18
+- @granite-js/plugin-core@0.1.18
+- @granite-js/utils@0.1.18
+
+## 0.1.17
+
+### Patch Changes
+
+- 07d4020: fix getId generation
+- 9c415df: supports dynamic plugin config
+- dfd1a1e: improve uncaught exception
+- Updated dependencies [9c415df]
+  - @granite-js/plugin-core@0.1.17
+  - @granite-js/devtools-frontend@0.1.17
+  - @granite-js/utils@0.1.17
+
 ## 0.1.16
 
 ### Patch Changes

package/dist/bundler/Bundler.d.ts

@@ -15,6 +15,7 @@ export declare class Bundler {
     }): Promise<BuildResult>;
     getId(): INTERNAL__Id;
     addPlugin(plugin: Plugin): this;
+    private setupUncaughtExceptionHandler;
     private getBaseBuildOptions;
     private setupEnvironment;
     private handlePrepare;

package/dist/bundler/Bundler.js

@@ -41,9 +41,11 @@ var import_logger = require("../logger");
 var import_getId = require("../utils/getId");
 var import_promise = require("../utils/promise");
 var import_presets = require("./internal/presets");
+var import_progressBar = require("../utils/progressBar");
 class Bundler {
   constructor(config) {
     this.config = config;
+    this.setupUncaughtExceptionHandler();
     const id = (0, import_getId.getId)(config);
     this.id = id;
     this.pluginDriver = new import_PluginDriver.PluginDriver(id);
@@ -83,6 +85,18 @@ class Bundler {
     this.pluginDriver.addPlugin(plugin);
     return this;
   }
+  setupUncaughtExceptionHandler() {
+    if (process.hasUncaughtExceptionCaptureCallback()) {
+      return;
+    }
+    process.setUncaughtExceptionCaptureCallback((error) => {
+      (0, import_progressBar.cleanup)();
+      import_logger.logger.error(`Uncaught exception occurred
+
+${error.stack ?? error.message}`);
+      process.exit(1);
+    });
+  }
   getBaseBuildOptions() {
     const { rootDir, metafile, buildConfig } = this.config;
     const { platform, entry, outfile = "bundle.js", esbuild: esbuild2 = {} } = buildConfig;

package/dist/metro/build.js

@@ -67,7 +67,8 @@ async function buildAll(optionsList, { config, concurrency = 2 }) {
   return buildResults;
 }
 async function buildImpl(config, { platform, outfile, minify = false, dev = true }) {
-  const metroConfig = await (0, import_getMetroConfig.getMetroConfig)({ rootPath: config.cwd }, config.metro);
+  const resolvedConfig = await (0, import_plugin_core.resolveConfig)(config);
+  const metroConfig = await (0, import_getMetroConfig.getMetroConfig)({ rootPath: config.cwd }, resolvedConfig?.metro ?? {});
   const outfileName = outfile == null ? (0, import_getDefaultOutfileName.getDefaultOutfileName)(config.entryFile, platform) : outfile;
   const outfilePath = import_path.default.join(config.outdir, outfileName);
   await import_src.default.runBuild(metroConfig, {

package/dist/operations/build.js

@@ -40,6 +40,7 @@ var import_bundler = require("../bundler");
 var import_performance = require("../performance");
 var import_buildResult = require("../utils/buildResult");
 var import_getDefaultOutfileName = require("../utils/getDefaultOutfileName");
+var import_printErrors = require("../utils/printErrors");
 var import_promise = require("../utils/promise");
 var import_writeBundle = require("../utils/writeBundle");
 async function build({ config, plugins = [], ...options }) {
@@ -64,7 +65,9 @@ async function buildAll(optionsList, { config, plugins = [], concurrency = 2 })
       }
     })
   );
-  if (taskResults.some(import_promise.isRejected)) {
+  const errors = taskResults.filter(import_promise.isRejected);
+  if (errors.length) {
+    (0, import_printErrors.printErrors)(errors);
     throw new Error("Build failed");
   }
   const buildResults = taskResults.filter(import_promise.isFulfilled).map((result) => result.value);
@@ -72,6 +75,7 @@ async function buildAll(optionsList, { config, plugins = [], concurrency = 2 })
   return buildResults;
 }
 async function buildImpl(config, plugins, { platform, outfile, cache = true, dev = true, metafile = false }) {
+  const { metro: _metroConfig, devServer: _devServerConfig, ...buildConfig } = await (0, import_plugin_core.resolveConfig)(config);
   const outfileName = outfile == null ? (0, import_getDefaultOutfileName.getDefaultOutfileName)(config.entryFile, platform) : outfile;
   const outfilePath = path.resolve(config.outdir, outfileName);
   const bundler = new import_bundler.Bundler({
@@ -83,7 +87,7 @@ async function buildImpl(config, plugins, { platform, outfile, cache = true, dev
       platform,
       entry: config.entryFile,
       outfile: outfilePath,
-      ...config.build
+      ...buildConfig
     }
   });
   for (const plugin of plugins) {

package/dist/operations/experimental/serve.js

@@ -50,9 +50,10 @@ async function EXPERIMENTAL__server({
   const driver = (0, import_plugin_core.createPluginHooksDriver)(config);
   await driver.devServer.pre({ host, port });
   const rootDir = config.cwd;
+  const { metro: _, devServer, ...buildConfig } = await (0, import_plugin_core.resolveConfig)(config) ?? {};
   const server = new import_DevServer.DevServer({
-    buildConfig: { entry: config.entryFile, ...config.build },
-    middlewares: config.devServer?.middlewares ?? [],
+    buildConfig: { entry: config.entryFile, ...buildConfig },
+    middlewares: devServer?.middlewares ?? [],
     host,
     port,
     rootDir

package/dist/operations/serve.js

@@ -79,7 +79,8 @@ async function runServer({
       }
     }
   };
-  const { middlewares = [], ...additionalMetroConfig } = config.metro ?? {};
+  const resolvedConfig = await (0, import_plugin_core.resolveConfig)(config);
+  const { middlewares = [], ...additionalMetroConfig } = resolvedConfig?.metro ?? {};
   const baseConfig = await (0, import_getMetroConfig.getMetroConfig)({ rootPath: config.cwd }, additionalMetroConfig);
   const metroConfig = mergeConfig(baseConfig, {
     server: { port },

package/dist/server/DevServer.js

@@ -43,7 +43,6 @@ var import_wss = require("./wss");
 var import_constants = require("../constants");
 var import_logger = require("../logger");
 var import_statusPlugin = require("../plugins/statusPlugin");
-var import_PersistentStorage = require("../shared/PersistentStorage");
 var import_isDebugMode = require("../utils/isDebugMode");
 var import_progressBar = require("../utils/progressBar");
 var import_dev_middleware = require("../vendors/@react-native/dev-middleware");
@@ -73,7 +72,6 @@ class DevServer {
   async initialize() {
     import_logger.logger.trace("DevServer.initialize");
     const { rootDir, buildConfig } = this.devServerOptions;
-    await import_PersistentStorage.persistentStorage.loadData();
     this.context = await this.createDevServerContext(rootDir, buildConfig);
   }
   listen() {

package/dist/shared/PersistentStorage.d.ts

@@ -1,20 +1,18 @@
 import { INTERNAL__Id } from '../types';
-/**
- * 파일 시스템에 저장되는 데이터 (캐싱된 메타 데이터)
- */
 interface PersistentData {
     [id: INTERNAL__Id]: {
         /**
-         * 번들링시 resolve 된 전체 모듈 수 (progress 계산에 사용)
+         * Resolved module count (used for progress bar progress calculation)
          */
         totalModuleCount: number;
     };
 }
 declare class PersistentStorage {
     private data;
+    constructor();
     getData(): PersistentData;
     setData(newData: Partial<PersistentData>): void;
-    loadData(): Promise<void>;
+    loadData(): void;
     saveData(): Promise<void>;
 }
 export declare const persistentStorage: PersistentStorage;

package/dist/shared/PersistentStorage.js

@@ -31,32 +31,35 @@ __export(PersistentStorage_exports, {
   persistentStorage: () => persistentStorage
 });
 module.exports = __toCommonJS(PersistentStorage_exports);
-var fs = __toESM(require("fs/promises"));
+var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 var import_es_toolkit = require("es-toolkit");
 var import_constants = require("../constants");
 class PersistentStorage {
   data = {};
+  constructor() {
+    this.loadData();
+  }
   getData() {
     return this.data;
   }
   setData(newData) {
     this.data = (0, import_es_toolkit.toMerged)(this.data, newData);
   }
-  async loadData() {
+  loadData() {
     try {
-      await fs.access(import_constants.MPACK_DATA_DIR, fs.constants.R_OK | fs.constants.W_OK);
+      fs.accessSync(import_constants.MPACK_DATA_DIR, fs.constants.R_OK | fs.constants.W_OK);
     } catch {
-      await fs.mkdir(import_constants.MPACK_DATA_DIR, { recursive: true });
+      fs.mkdirSync(import_constants.MPACK_DATA_DIR, { recursive: true });
     }
     try {
-      this.data = JSON.parse(await fs.readFile(path.join(import_constants.MPACK_DATA_DIR, ".mpack"), "utf-8"));
+      this.data = JSON.parse(fs.readFileSync(path.join(import_constants.MPACK_DATA_DIR, ".mpack"), "utf-8"));
     } catch {
     }
   }
   async saveData() {
     try {
-      await fs.writeFile(path.join(import_constants.MPACK_DATA_DIR, ".mpack"), JSON.stringify(this.data, null, 2), "utf-8");
+      await fs.promises.writeFile(path.join(import_constants.MPACK_DATA_DIR, ".mpack"), JSON.stringify(this.data, null, 2), "utf-8");
     } catch {
     }
   }

package/dist/utils/getId.js

@@ -25,7 +25,20 @@ var import_md5 = require("./md5");
 var import_constants = require("../constants");
 function getId(bundleConfig) {
   return (0, import_md5.md5)(
-    JSON.stringify([import_constants.VERSION, bundleConfig.rootDir, bundleConfig.dev, bundleConfig.buildConfig])
+    JSON.stringify([
+      import_constants.VERSION,
+      bundleConfig.rootDir,
+      bundleConfig.dev,
+      bundleConfig.buildConfig.resolver,
+      bundleConfig.buildConfig.transformer,
+      bundleConfig.buildConfig.platform,
+      bundleConfig.buildConfig.babel,
+      bundleConfig.buildConfig.swc,
+      bundleConfig.buildConfig.esbuild?.loader,
+      bundleConfig.buildConfig.esbuild?.resolveExtensions,
+      bundleConfig.buildConfig.esbuild?.mainFields,
+      bundleConfig.buildConfig.esbuild?.conditions
+    ])
   );
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/utils/printErrors.d.ts

@@ -0,0 +1 @@
+export declare function printErrors(errors: PromiseRejectedResult[]): void;

package/dist/utils/printErrors.js

@@ -0,0 +1,32 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var printErrors_exports = {};
+__export(printErrors_exports, {
+  printErrors: () => printErrors
+});
+module.exports = __toCommonJS(printErrors_exports);
+function printErrors(errors) {
+  for (const error of errors) {
+    console.error(error.reason);
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  printErrors
+});

package/dist/utils/progressBar.d.ts

@@ -7,3 +7,4 @@ export interface BuildStatusProgressBar {
     remove: () => void;
 }
 export declare function createProgressBar(label: string): BuildStatusProgressBar;
+export declare function cleanup(): void;

package/dist/utils/progressBar.js

@@ -28,6 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var progressBar_exports = {};
 __export(progressBar_exports, {
+  cleanup: () => cleanup,
   createProgressBar: () => createProgressBar
 });
 module.exports = __toCommonJS(progressBar_exports);
@@ -91,7 +92,11 @@ function createProgressBar(label) {
     }
   };
 }
+function cleanup() {
+  Frogress.removeAll();
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  cleanup,
   createProgressBar
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@granite-js/mpack",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "A bundler for Granite apps",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -83,9 +83,9 @@
     "@babel/traverse": "^7.14.0",
     "@babel/types": "^7.0.0",
     "@fastify/static": "7.0.1",
-    "@granite-js/devtools-frontend": "0.1.16",
-    "@granite-js/plugin-core": "0.1.16",
-    "@granite-js/utils": "0.1.16",
+    "@granite-js/devtools-frontend": "0.1.18",
+    "@granite-js/plugin-core": "0.1.18",
+    "@granite-js/utils": "0.1.18",
     "@inquirer/prompts": "^7.2.3",
     "@react-native-community/cli-plugin-metro": "11.3.7",
     "@react-native-community/cli-server-api": "11.3.7",