@formatjs/unplugin 1.0.0 → 1.1.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@formatjs/unplugin",
   "description": "Universal build plugin for FormatJS — supports Vite, Webpack, Rollup, esbuild, and Rspack",
-  "version": "1.0.0",
+  "version": "1.1.3",
   "license": "MIT",
   "author": "Long Ho <holevietlong@gmail.com>",
   "type": "module",
@@ -16,11 +16,11 @@
     "./transform": "./transform.js"
   },
   "dependencies": {
-    "@formatjs/icu-messageformat-parser": "workspace:*",
-    "@formatjs/ts-transformer": "workspace:*",
     "magic-string": "^0.30.0",
-    "oxc-parser": "^0.114.0",
-    "unplugin": "^2.3.0"
+    "oxc-parser": "^0.120.0",
+    "unplugin": "^3.0.0",
+    "@formatjs/ts-transformer": "4.4.2",
+    "@formatjs/icu-messageformat-parser": "3.5.3"
   },
   "peerDependencies": {
     "@rspack/core": ">=1",
@@ -62,4 +62,4 @@
     }
   },
   "repository": "formatjs/formatjs.git"
-}
+}

package/transform.js

@@ -83,10 +83,9 @@ export function transform(code, id, options) {
 		const attributes = elementNode.attributes || [];
 		const descriptor = {};
 		const locations = {};
-		// Use the position right after the element name as the insertion point
-		// Find the first attribute start, or use the end of the element name
-		const firstAttr = attributes[0];
-		locations.insertionPoint = firstAttr ? firstAttr.start : elementNode.name.end;
+		// Always insert after the element name so the id survives even when the
+		// first attribute (e.g. description) is removed.
+		locations.insertionPoint = elementNode.name.end;
 		for (const attr of attributes) {
 			if (attr.type !== "JSXAttribute") continue;
 			const attrName = attr.name;
@@ -140,7 +139,7 @@ export function transform(code, id, options) {
 			} else if (locations.insertionPoint != null) {
 				// Insert id at a stable position (after `{` for objects, before first attr for JSX)
 				if (isJSX) {
-					s.appendLeft(locations.insertionPoint, `id=${JSON.stringify(newId)} `);
+					s.appendLeft(locations.insertionPoint, ` id=${JSON.stringify(newId)}`);
 				} else {
 					s.appendRight(locations.insertionPoint, `id: ${JSON.stringify(newId)}, `);
 				}
@@ -229,14 +228,16 @@ export function transform(code, id, options) {
 		// Walk backward through attribute name
 		while (i >= 0 && /[a-zA-Z0-9_$]/.test(code[i])) i--;
 		const attrStart = i + 1;
-		let attrEnd = loc.end;
-		// Skip trailing whitespace
-		let j = attrEnd;
-		while (j < code.length && (code[j] === " " || code[j] === "	")) j++;
-		attrEnd = j;
-		// Also remove leading whitespace
+		const attrEnd = loc.end;
+		// Remove leading whitespace/newline before attribute name.
+		// We intentionally do NOT consume trailing whitespace so that when attributes
+		// are on the same line the space before the next attribute is preserved.
+		// e.g. `<FM description="x" defaultMessage="y" />` → `<FM defaultMessage="y" />`
 		let k = attrStart - 1;
 		while (k >= 0 && (code[k] === " " || code[k] === "	")) k--;
+		// Also include the preceding newline for multi-line JSX so the whole line is removed.
+		if (k >= 0 && code[k] === "\n") k--;
+		if (k >= 0 && code[k] === "\r") k--;
 		const removeStart = k + 1;
 		s.remove(removeStart, attrEnd);
 	}