@lingui/macro 3.16.0 → 3.17.0

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.17.0](https://github.com/lingui/js-lingui/compare/v3.16.1...v3.17.0) (2023-02-01)
+
+
+### Bug Fixes
+
+* **macro:** JS macros don't strip non-essential props in production ([#1389](https://github.com/lingui/js-lingui/issues/1389)) ([0ff55d6](https://github.com/lingui/js-lingui/commit/0ff55d606e4eba496548675e42c744d0d872d838))
+
+
+### Features
+
+* **macro:** throw useful error message if macro used without a plugin ([#1355](https://github.com/lingui/js-lingui/issues/1355)) ([7d55904](https://github.com/lingui/js-lingui/commit/7d55904bb76fae384558945863423145978b9bd6))
+
+
+
+
+
+## [3.16.1](https://github.com/lingui/js-lingui/compare/v3.16.0...v3.16.1) (2023-01-24)
+
+**Note:** Version bump only for package @lingui/macro
+
+
+
+
+
 # [3.16.0](https://github.com/lingui/js-lingui/compare/v3.15.0...v3.16.0) (2023-01-18)
 
 

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Tomáš Ehrlich
+Copyright (c) 2017-2022 Tomáš Ehrlich, (c) 2022-2023 Crowdin.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -40,8 +40,8 @@ const message = i18n._(t`Hello, my name is ${name} and today is ${date(now)}`)
 
 [license]: https://github.com/lingui/js-lingui/blob/main/LICENSE
 [linguijs]: https://github.com/lingui/js-lingui
-[documentation]: https://lingui.js.org/
-[reference]: https://lingui.js.org/ref/macro/
+[documentation]: https://lingui.dev
+[reference]: https://lingui.dev/ref/macro/
 [package]: https://www.npmjs.com/package/@lingui/macro
 [badge-downloads]: https://img.shields.io/npm/dw/@lingui/macro.svg
 [badge-version]: https://img.shields.io/npm/v/@lingui/macro.svg

package/build/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Tomáš Ehrlich
+Copyright (c) 2017-2022 Tomáš Ehrlich, (c) 2022-2023 Crowdin.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/build/index.js

@@ -39,6 +39,8 @@ const getSymbolSource = name => {
 
 const [i18nImportModule, i18nImportName = "i18n"] = getSymbolSource("i18n");
 const [TransImportModule, TransImportName = "Trans"] = getSymbolSource("Trans");
+const jsMacroTags = new Set(['defineMessage', 'arg', 't', 'plural', 'select', 'selectOrdinal']);
+const jsxMacroTags = new Set(['Trans', 'Plural', 'Select', 'SelectOrdinal']);
 
 function macro({
   references,
@@ -50,21 +52,18 @@ function macro({
   let needsI18nImport = false;
   Object.keys(references).forEach(tagName => {
     const nodes = references[tagName];
-    const macroType = getMacroType(tagName);
 
-    if (macroType == null) {
-      throw nodes[0].buildCodeFrameError(`Unknown macro ${tagName}`);
-    }
-
-    if (macroType === "js") {
+    if (jsMacroTags.has(tagName)) {
       nodes.forEach(node => {
         jsNodes.push(node.parentPath);
       });
-    } else {
+    } else if (jsxMacroTags.has(tagName)) {
       nodes.forEach(node => {
         // identifier.openingElement.jsxElement
         jsxNodes.push(node.parentPath.parentPath);
       });
+    } else {
+      throw nodes[0].buildCodeFrameError(`Unknown macro ${tagName}`);
     }
   });
   jsNodes.filter(isRootPath(jsNodes)).forEach(path => {
@@ -135,23 +134,14 @@ const alreadyVisited = path => {
   }
 };
 
-function getMacroType(tagName) {
-  switch (tagName) {
-    case "defineMessage":
-    case "arg":
-    case "t":
-    case "plural":
-    case "select":
-    case "selectOrdinal":
-      return "js";
-
-    case "Trans":
-    case "Plural":
-    case "Select":
-    case "SelectOrdinal":
-      return "jsx";
-  }
-}
+[...jsMacroTags, ...jsxMacroTags].forEach(name => {
+  Object.defineProperty(module.exports, name, {
+    get() {
+      throw new Error(`The macro you imported from "@lingui/macro" is being executed outside the context of compilation with babel-plugin-macros. ` + `This indicates that you don't have the babel plugin "babel-plugin-macros" configured correctly. ` + `Please see the documentation for how to configure babel-plugin-macros properly: ` + 'https://github.com/kentcdodds/babel-plugin-macros/blob/main/other/docs/user.md');
+    }
+
+  });
+});
 
 var _default = (0, _babelPluginMacros.createMacro)(macro);
 

package/build/macroJs.js

@@ -139,7 +139,7 @@ class MacroJs {
   replaceDefineMessage = path => {
     // reset the expression counter
     this._expressionIndex = (0, _utils.makeCounter)();
-    const descriptor = this.processDescriptor(path.node.arguments[0]);
+    let descriptor = this.processDescriptor(path.node.arguments[0]);
     path.replaceWith(descriptor);
   };
   /**
@@ -148,7 +148,7 @@ class MacroJs {
    */
 
   replaceTAsFunction = (path, linguiInstance) => {
-    const descriptor = this.processDescriptor(path.node.arguments[0]);
+    let descriptor = this.processDescriptor(path.node.arguments[0]);
     const newNode = this.types.callExpression(this.types.memberExpression(linguiInstance ?? this.types.identifier(this.i18nImportName), this.types.identifier("_")), [descriptor]);
     path.replaceWith(newNode);
   };
@@ -200,6 +200,11 @@ class MacroJs {
 
     const hasId = descriptor.properties.findIndex(property => (0, _types.isObjectProperty)(property) && this.isIdentifier(property.key, _constants.ID)) !== -1;
     descriptor.properties[messageIndex] = this.types.objectProperty(this.types.identifier(hasId ? _constants.MESSAGE : _constants.ID), messageNode);
+
+    if (process.env.NODE_ENV === "production") {
+      descriptor.properties = descriptor.properties.filter(property => (0, _types.isObjectProperty)(property) && !this.isIdentifier(property.key, _constants.MESSAGE) && (0, _types.isObjectProperty)(property) && !this.isIdentifier(property.key, _constants.COMMENT));
+    }
+
     return descriptor;
   };
   addValues = (obj, values) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/macro",
-  "version": "3.16.0",
+  "version": "3.17.0",
   "description": "Macro for generating messages in ICU MessageFormat syntax",
   "main": "./build/index.js",
   "author": {
@@ -28,7 +28,7 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.11.2",
-    "@lingui/conf": "3.16.0",
+    "@lingui/conf": "3.17.0",
     "ramda": "^0.27.1"
   },
   "peerDependencies": {
@@ -39,5 +39,5 @@
   "devDependencies": {
     "@types/babel-plugin-macros": "^2.8.5"
   },
-  "gitHead": "e8c1f518b988f45f3f6da84333550b215dcde94b"
+  "gitHead": "1c8bc46213b35b25da8fe7a80ddcf6f6a5d9d539"
 }