@lingui/macro 3.13.3 → 3.15.0

package/index.js

@@ -56,6 +56,17 @@ function macro(_ref) {
   var jsxNodes = [];
   var jsNodes = [];
   var needsI18nImport = false;
+  var alreadyVisitedCache = new WeakSet();
+
+  var alreadyVisited = function alreadyVisited(path) {
+    if (alreadyVisitedCache.has(path)) {
+      return true;
+    } else {
+      alreadyVisitedCache.add(path);
+      return false;
+    }
+  };
+
   Object.keys(references).forEach(function (tagName) {
     var nodes = references[tagName];
     var macroType = getMacroType(tagName);
@@ -134,17 +145,6 @@ function isRootPath(allPath) {
   };
 }
 
-var alreadyVisitedCache = [];
-
-function alreadyVisited(path) {
-  if (alreadyVisitedCache.includes(path)) {
-    return true;
-  } else {
-    alreadyVisitedCache.push(path);
-    return false;
-  }
-}
-
 function getMacroType(tagName) {
   switch (tagName) {
     case "defineMessage":

package/macroJsx.js

@@ -67,11 +67,8 @@ var MacroJSX = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "expressionIndex", void 0);
     (0, _defineProperty2.default)(this, "elementIndex", void 0);
     (0, _defineProperty2.default)(this, "safeJsxAttribute", function (name, value) {
-      // Quoted JSX attributes use XML-style escapes instead of JavaScript-style escapes.
-      // This means that <Trans id="Say \"hi\"!" /> is invalid, but <Trans id={"Say \"hi\"!"} /> is valid.
-      // We could consider removing this condition and always wrap in a jsxExpressionContainer.
-      var attributeValue = value.includes('"') ? _this.types.jsxExpressionContainer(_this.types.stringLiteral(value)) : _this.types.stringLiteral(value);
-      return _this.types.jsxAttribute(_this.types.jsxIdentifier(name), attributeValue);
+      // This handles quoted JSX attributes and html entities.
+      return _this.types.jsxAttribute(_this.types.jsxIdentifier(name), _this.types.jsxExpressionContainer(_this.types.stringLiteral(value)));
     });
     (0, _defineProperty2.default)(this, "replacePath", function (path) {
       var tokens = _this.tokenizeNode(path.node);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/macro",
-  "version": "3.13.3",
+  "version": "3.15.0",
   "description": "Macro for generating messages in ICU MessageFormat syntax",
   "main": "index.js",
   "author": {
@@ -30,7 +30,7 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.11.2",
-    "@lingui/conf": "^3.13.3",
+    "@lingui/conf": "^3.15.0",
     "ramda": "^0.27.1"
   },
   "peerDependencies": {