@open-xchange/vite-plugin-po2json 1.0.0-pre1 → 1.0.0-pre2

package/dist/index.js

@@ -58,23 +58,27 @@ export default function gettextPlugin(options) {
             }
         },
         resolveId(id) {
-            if (/^gettext$/.test(id)) {
+            // Strip \0 prefix for matching (Rolldown convention for virtual modules)
+            const cleanId = id.startsWith('\0') ? id.slice(1) : id;
+            if (/^(virtual:)?gettext$/.test(cleanId)) {
                 const meta = { gettext: { dictionary: true } };
-                return { id: `${defaultDictionary}.js`, meta };
+                return { id: `\0${defaultDictionary}.js`, meta };
             }
-            const gettextModuleMatch = id.match(/gettext\?.*dictionary=([^&]+)/);
+            const gettextModuleMatch = cleanId.match(/(virtual:)?gettext\?.*dictionary=([^&]+)/);
             if (gettextModuleMatch) {
-                dictionaries.add(gettextModuleMatch[1].replace(/\.js$/, ''));
+                dictionaries.add(gettextModuleMatch[2].replace(/\.js$/, ''));
                 const meta = { gettext: { dictionary: true } };
-                return { id: gettextModuleMatch[1].replace(/(\.js)?$/, '.js'), meta };
+                return { id: `\0${gettextModuleMatch[2].replace(/(\.js)?$/, '.js')}`, meta };
             }
-            if (dictionaries.has(id.replace(/\.js$/, ''))) {
+            if (dictionaries.has(cleanId.replace(/\.js$/, ''))) {
                 const meta = { gettext: { dictionary: true } };
-                return { id, meta };
+                return { id: id.startsWith('\0') ? id : `\0${id}`, meta };
             }
-            const match = id.match(/(.*)\.([a-zA-Z]{2}_[a-zA-Z]{2})(\.js)?$/);
+            const match = cleanId.match(/(.*)\.([a-zA-Z]{2}_[a-zA-Z]{2})(\.js)?$/);
             const [, namespace, language] = match || [];
-            return (namespace && language) ? id : null;
+            if (namespace && language)
+                return id.startsWith('\0') ? id : `\0${id}`;
+            return null;
         },
         transform: {
             order: 'pre',
@@ -83,7 +87,9 @@ export default function gettextPlugin(options) {
             }
         },
         async load(id) {
-            const dictionary = id.replace(/\\/g, '/').replace(/^\.?\//, '').replace(/\.js$/, '');
+            if (!id.startsWith('\0'))
+                return;
+            const dictionary = id.slice(1).replace(/\\/g, '/').replace(/^\.?\//, '').replace(/\.js$/, '');
             if (dictionaries.has(dictionary)) {
                 const poDir = path.dirname(poFiles);
                 const languages = (await readdir(poDir)).map(f => (f.match(/([^/]+).po$/) || [])[1]).filter(a => Boolean(a));
@@ -94,7 +100,8 @@ export default function gettextPlugin(options) {
                     .replaceAll(/['"]{{languages}}['"]/g, languages.map(lang => `'${lang}'`).join(', '));
                 return { meta: { gettext: { dictionary: true } }, code };
             }
-            const match = id.match(/\.?\/?(.*)\.([a-zA-Z]{2}_[a-zA-Z]{2})(\.js)?$/);
+            const cleanId = id.slice(1);
+            const match = cleanId.match(/\.?\/?(.*)\.([a-zA-Z]{2}_[a-zA-Z]{2})(\.js)?$/);
             const [, namespace, language] = match || [];
             if (!namespace || !language || !dictionaries.has(namespace))
                 return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-xchange/vite-plugin-po2json",
-  "version": "1.0.0-pre1",
+  "version": "1.0.0-pre2",
   "description": "A Vite plugin to load po files into our gettext based dictionary implementation.",
   "type": "module",
   "main": "dist/index.js",