@wuchale/vite-plugin 0.15.4 → 0.15.6

package/dist/index.d.ts

@@ -14,14 +14,14 @@ type HotUpdateCtx = {
 declare class Wuchale {
     #private;
     name: string;
-    constructor(configPath: string);
+    constructor(configPath?: string);
     configResolved: (config: {
         env: {
             DEV?: boolean;
         };
         root: string;
     }) => Promise<void>;
-    handleHotUpdate: (ctx: HotUpdateCtx) => Promise<any[]>;
+    handleHotUpdate: (ctx: HotUpdateCtx) => Promise<never[] | undefined>;
     transform: {
         order: "pre";
         handler: (code: string, id: string, options?: {

package/dist/index.js

@@ -14,13 +14,14 @@ class Wuchale {
     #singleCompiledCatalogs = new Set();
     #locales = [];
     #log;
+    #mode;
     #configPath;
     #hmrVersion = -1;
     #lastSourceTriggeredPOWrite = 0;
     constructor(configPath) {
         this.#configPath = configPath;
     }
-    #init = async (mode) => {
+    #init = async () => {
         this.#config = await getConfig(this.#configPath);
         this.#log = new Logger(this.#config.logLevel);
         this.#locales = [this.#config.sourceLocale, ...this.#config.otherLocales];
@@ -29,7 +30,7 @@ class Wuchale {
         }
         const sharedState = {};
         for (const [key, adapter] of Object.entries(this.#config.adapters)) {
-            const handler = new AdapterHandler(adapter, key, this.#config, mode, this.#projectRoot, this.#log);
+            const handler = new AdapterHandler(adapter, key, this.#config, this.#mode, this.#projectRoot, this.#log);
             await handler.init(sharedState);
             handler.onBeforeWritePO = () => {
                 this.#lastSourceTriggeredPOWrite = performance.now();
@@ -70,25 +71,31 @@ class Wuchale {
         }
     };
     configResolved = async (config) => {
-        let mode;
         if (config.env.DEV) {
-            mode = 'dev';
+            this.#mode = 'dev';
         }
         else {
-            mode = 'build';
+            this.#mode = 'build';
         }
         this.#projectRoot = config.root;
-        await this.#init(mode);
+        await this.#init();
     };
     handleHotUpdate = async (ctx) => {
+        if (!this.#config.hmr) {
+            return;
+        }
+        // This is mainly to make sure that PO catalog changes result in a page reload with new catalogs
         if (!(ctx.file in this.#adaptersByCatalogPath)) {
+            // prevent reloading whole app because of a change in compiled catalog
+            // triggered by extraction from single file, hmr handled by embedding patch
             if (this.#singleCompiledCatalogs.has(ctx.file)) {
                 return [];
             }
+            // for granular as well
             for (const adapter of this.#granularLoadAdapters) {
                 for (const loc of this.#locales) {
                     for (const id in adapter.granularStateByID) {
-                        if (resolve(adapter.getCompiledFilePath(loc, id)) === id) {
+                        if (resolve(adapter.getCompiledFilePath(loc, id)) === ctx.file) {
                             return [];
                         }
                     }
@@ -97,12 +104,13 @@ class Wuchale {
             this.#hmrVersion++;
             return;
         }
+        // catalog changed
         const sourceTriggered = performance.now() - this.#lastSourceTriggeredPOWrite < 1000; // long enough threshold
         const invalidatedModules = new Set();
         for (const adapter of this.#adaptersByCatalogPath[ctx.file]) {
             const loc = adapter.catalogPathsToLocales[ctx.file];
             if (!sourceTriggered) {
-                await adapter.loadCatalogNCompile(loc);
+                await adapter.loadCatalogNCompile(loc, this.#hmrVersion);
             }
             for (const loadID of adapter.getLoadIDs()) {
                 const fileID = resolve(adapter.getCompiledFilePath(loc, loadID));
@@ -117,7 +125,7 @@ class Wuchale {
         }
     };
     #transformHandler = async (code, id, options) => {
-        if (!this.#config.hmr) {
+        if (this.#mode === 'dev' && !this.#config.hmr) {
             return {};
         }
         const filename = relative(this.#projectRoot, id);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/vite-plugin",
-    "version": "0.15.4",
+    "version": "0.15.6",
     "description": "Protobuf-like i18n from plain code: Vite plugin",
     "scripts": {
         "dev": "tsc --watch",
@@ -40,7 +40,7 @@
     "author": "K1DV5",
     "license": "MIT",
     "dependencies": {
-        "wuchale": "^0.18.6"
+        "wuchale": "^0.18.9"
     },
     "devDependencies": {
         "typescript": "^5.9.3"