feat(react): fix macro export conditions for NodeNext and Bundler res…

…olutions (#1915)

packages/core/package.json

@@ -46,10 +46,8 @@
       }
     },
     "./macro": {
-      "require": {
-        "types": "./macro/index.d.ts",
-        "default": "./macro/index.js"
-      }
+      "types": "./macro/index.d.ts",
+      "default": "./macro/index.js"
     },
     "./package.json": "./package.json"
   },

packages/macro/index.d.ts

@@ -25,70 +25,74 @@ import {
 /**
  * @deprecated please import from `@lingui/core/macro` directly
  */
-const t = _t
+declare const t: typeof _t
+
 /**
  * @deprecated please import from `@lingui/core/macro` directly
  */
-const msg = _msg
+declare const msg: typeof _msg
 /**
  * @deprecated please import from `@lingui/core/macro` directly
  */
-const plural = _plural
+declare const plural: typeof _plural
 /**
  * @deprecated please import from `@lingui/core/macro` directly
  */
-const defineMessage = _defineMessage
+declare const defineMessage: typeof _defineMessage
 /**
  * @deprecated please import from `@lingui/core/macro` directly
  */
-const select = _select
+declare const select: typeof _select
 /**
  * @deprecated please import from `@lingui/core/macro` directly
  */
-const selectOrdinal = _selectOrdinal
+declare const selectOrdinal: typeof _selectOrdinal
 /**
  * @deprecated please import from `@lingui/core/macro` directly
  */
-const SelectOptions = _SelectOptions
+declare const SelectOptions: _SelectOptions
 /**
  * @deprecated please import from `@lingui/core/macro` directly
  */
-const ChoiceOptions = _ChoiceOptions
+declare const ChoiceOptions: _ChoiceOptions
 /**
  * @deprecated please import from `@lingui/core/macro` directly
  */
-const MacroMessageDescriptor = _MacroMessageDescriptor
+declare const MacroMessageDescriptor: _MacroMessageDescriptor
 
-export const Trans = _Trans
 /**
  * @deprecated please import from `@lingui/react/macro` directly
  */
-export const Plural = _Plural
+declare const Trans: typeof _Trans
+/**
+ * @deprecated please import from `@lingui/react/macro` directly
+ */
+export const Plural: typeof _Plural
 /**
  * @deprecated please import from `@lingui/react/macro` directly
  */
-export const PluralChoiceProps = _PluralChoiceProps
+export const PluralChoiceProps: _PluralChoiceProps
 /**
  * @deprecated please import from `@lingui/react/macro` directly
  */
-export const SelectChoiceProps = _SelectChoiceProps
+export const SelectChoiceProps: _SelectChoiceProps
 /**
  * @deprecated please import from `@lingui/react/macro` directly
  */
-export const Select = _Select
+export const Select: typeof _Select
 /**
  * @deprecated please import from `@lingui/react/macro` directly
  */
-export const CommonProps = _CommonProps
+export const CommonProps: _CommonProps
 /**
  * @deprecated please import from `@lingui/react/macro` directly
  */
-export const SelectOrdinal = _SelectOrdinal
+export const SelectOrdinal: typeof _SelectOrdinal
 /**
  * @deprecated please import from `@lingui/react/macro` directly
  */
-export const TransProps = _TransProps
+export const TransProps: _TransProps
 /**
  * @deprecated please import from `@lingui/react/macro` directly
  */
-export const useLingui = _useLingui
+export const useLingui: typeof _useLingui

packages/macro/package.json

@@ -2,7 +2,7 @@
   "name": "@lingui/macro",
   "version": "4.8.0-next.1",
   "description": "Macro for generating messages in ICU MessageFormat syntax",
-  "main": "./index.cjs",
+  "main": "./index.js",
   "types": "./index.d.ts",
   "sideEffects": false,
   "author": {
@@ -35,10 +35,8 @@
   },
   "exports": {
     ".": {
-      "require": {
-        "types": "./index.d.ts",
-        "default": "./index.cjs"
-      }
+      "types": "./index.d.ts",
+      "default": "./index.js"
     }
   },
   "files": [

packages/react/macro/index.d.ts

@@ -103,8 +103,11 @@ export const SelectOrdinal: VFC<PluralChoiceProps>
  */
 export const Select: VFC<SelectChoiceProps>
 
-function _t(descriptor: MacroMessageDescriptor): string
-function _t(literals: TemplateStringsArray, ...placeholders: any[]): string
+declare function _t(descriptor: MacroMessageDescriptor): string
+declare function _t(
+  literals: TemplateStringsArray,
+  ...placeholders: any[]
+): string
 
 /**
  *

packages/react/package.json

@@ -62,10 +62,8 @@
       }
     },
     "./macro": {
-      "require": {
-        "types": "./macro/index.d.ts",
-        "default": "./macro/index.js"
-      }
+      "types": "./macro/index.d.ts",
+      "default": "./macro/index.js"
     },
     "./package.json": "./package.json"
   },

test/typescript-nodenext-resolution/index.ts

@@ -3,6 +3,10 @@
 
 import { i18n } from "@lingui/core"
 import { Trans } from "@lingui/react"
+import { t as t1 } from "@lingui/macro"
+import { t } from "@lingui/core/macro"
+import { Trans as TransMacro } from "@lingui/react/macro"
 
 console.log(i18n)
 console.log(Trans)
+console.log(t1, t, TransMacro)

test/typescript-nodenext-resolution/package.json

@@ -7,6 +7,7 @@
   },
   "dependencies": {
     "@lingui/core": "workspace:*",
+    "@lingui/macro": "workspace:*",
     "@lingui/react": "workspace:*"
   },
   "devDependencies": {

yarn.lock

@@ -3604,7 +3604,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@lingui/macro@workspace:packages/macro":
+"@lingui/macro@workspace:*, @lingui/macro@workspace:packages/macro":
   version: 0.0.0-use.local
   resolution: "@lingui/macro@workspace:packages/macro"
   dependencies:
@@ -15379,6 +15379,7 @@ __metadata:
   resolution: "typescript-nodenext-resolution@workspace:test/typescript-nodenext-resolution"
   dependencies:
     "@lingui/core": "workspace:*"
+    "@lingui/macro": "workspace:*"
     "@lingui/react": "workspace:*"
     typescript: 4.9.5
   languageName: unknown