@wuchale/vite-plugin 0.13.2 → 0.14.0

package/dist/index.d.ts

@@ -26,7 +26,9 @@ declare class Plugin {
     load: (id: string) => string;
     transform: {
         order: "pre";
-        handler: (code: string, id: string) => Promise<{
+        handler: (code: string, id: string, options: {
+            ssr?: boolean;
+        }) => Promise<{
             code?: string;
             map?: any;
         }>;

package/dist/index.js

@@ -31,15 +31,22 @@ class Plugin {
             const handler = new AdapterHandler(adapter, key, this.#config, mode, virtualPrefix, this.#projectRoot, this.#log);
             await handler.init(sharedState);
             this.#adapters[key] = handler;
-            const loaderPath = resolve(handler.loaderPath);
-            if (loaderPath in this.#adaptersByLoaderPath) {
-                throw new Error([
-                    'While catalogs can be shared, the same loader cannot be used by multiple adapters',
-                    `Conflicting: ${key} and ${this.#adaptersByLoaderPath[loaderPath].key}`,
-                    'Specify a different loaderPath for one of them.'
-                ].join('\n'));
+            for (const path of Object.values(handler.loaderPath)) {
+                const loaderPath = resolve(path);
+                if (loaderPath in this.#adaptersByLoaderPath) {
+                    const otherKey = this.#adaptersByLoaderPath[loaderPath].key;
+                    if (otherKey === key) {
+                        // same loader for both ssr and client, no problem
+                        continue;
+                    }
+                    throw new Error([
+                        'While catalogs can be shared, the same loader cannot be used by multiple adapters',
+                        `Conflicting: ${key} and ${otherKey}`,
+                        'Specify a different loaderPath for one of them.'
+                    ].join('\n'));
+                }
+                this.#adaptersByLoaderPath[loaderPath] = handler;
             }
-            this.#adaptersByLoaderPath[loaderPath] = handler;
             for (const fname of Object.keys(handler.catalogPathsToLocales)) {
                 this.#adaptersByCatalogPath[fname] ??= [];
                 this.#adaptersByCatalogPath[fname].push(handler);
@@ -122,14 +129,14 @@ class Plugin {
         }
         return adapter.getProxy();
     };
-    #transformHandler = async (code, id) => {
+    #transformHandler = async (code, id, options) => {
         if (!this.#config.hmr) {
             return {};
         }
         const filename = relative(this.#projectRoot, id);
         for (const adapter of Object.values(this.#adapters)) {
             if (adapter.fileMatches(filename)) {
-                return await adapter.transform(code, filename, this.#hmrVersion);
+                return await adapter.transform(code, filename, this.#hmrVersion, options.ssr);
             }
         }
         return {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/vite-plugin",
-    "version": "0.13.2",
+    "version": "0.14.0",
     "description": "Protobuf-like i18n from plain code: Vite plugin",
     "scripts": {
         "dev": "tsc --watch",
@@ -40,7 +40,7 @@
     "author": "K1DV5",
     "license": "MIT",
     "dependencies": {
-        "wuchale": "^0.14.2"
+        "wuchale": "^0.15.0"
     },
     "devDependencies": {
         "typescript": "^5.8.3"