From 1adb61d1c899268accca8ea655abfaeee71de06b Mon Sep 17 00:00:00 2001
From: Timofei Iatsenko <ty@time.sc>
Date: Fri, 24 Feb 2023 10:36:14 +0100
Subject: [PATCH 1/2] Revert "fix(vite-plugin): ship in dual package format for
 compatibility with Vite (#1450)"

This reverts commit e3a2b3936e9f2d74c1357c493537c3c291b4875f.
---
 packages/vite-plugin/package.json  | 22 +++-------------------
 packages/vite-plugin/tsconfig.json |  1 -
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/packages/vite-plugin/package.json b/packages/vite-plugin/package.json
index 43a36d249..949990ceb 100644
--- a/packages/vite-plugin/package.json
+++ b/packages/vite-plugin/package.json
@@ -2,9 +2,8 @@
   "name": "@lingui/vite-plugin",
   "version": "3.17.1",
   "description": "Vite plugin for Lingui message catalogs",
-  "main": "./build/cjs/index.js",
-  "module": "./build/esm/index.js",
-  "types": "./build/esm/index.d.ts",
+  "main": "./build/index.js",
+  "types": "./build/index.d.ts",
   "license": "MIT",
   "keywords": [
     "vite-plugin",
@@ -18,10 +17,7 @@
     "translation"
   ],
   "scripts": {
-    "clean": "rimraf ./build",
-    "build:esm": "tsc --module esnext --outDir ./build/esm",
-    "build:cjs": "tsc --module commonjs --outDir ./build/cjs",
-    "build": "yarn clean && yarn build:esm && yarn build:cjs"
+    "build": "rimraf ./build && tsc"
   },
   "repository": {
     "type": "git",
@@ -30,18 +26,6 @@
   "bugs": {
     "url": "https://github.com/lingui/js-lingui/issues"
   },
-  "exports": {
-    ".": {
-      "require": {
-        "types": "./build/cjs/index.d.ts",
-        "default": "./build/cjs/index.js"
-      },
-      "import": {
-        "types": "./build/esm/index.d.ts",
-        "default": "./build/esm/index.js"
-      }
-    }
-  },
   "engines": {
     "node": ">=14.0.0"
   },
diff --git a/packages/vite-plugin/tsconfig.json b/packages/vite-plugin/tsconfig.json
index 8cf1647eb..6a44210eb 100644
--- a/packages/vite-plugin/tsconfig.json
+++ b/packages/vite-plugin/tsconfig.json
@@ -5,7 +5,6 @@
     "sourceMap": true,
     "noEmit": false,
     "declaration": true,
-    "moduleResolution": "Node",
     "outDir": "./build",
     "esModuleInterop": true,
     "resolveJsonModule": true

From b8c6ec9ec21281963f3664f26388b1879a6f4c73 Mon Sep 17 00:00:00 2001
From: Timofei Iatsenko <ty@time.sc>
Date: Fri, 24 Feb 2023 10:44:27 +0100
Subject: [PATCH 2/2] fix(vite-plugin): change default export to named export

default exports has problems when used between CJS/ESM
---
 packages/vite-plugin/README.md     | 2 +-
 packages/vite-plugin/index.js      | 2 +-
 packages/vite-plugin/src/index.ts  | 4 +++-
 packages/vite-plugin/test/index.ts | 4 ++--
 website/docs/ref/vite-plugin.md    | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/vite-plugin/README.md b/packages/vite-plugin/README.md
index 701c92c29..3d3de27b0 100644
--- a/packages/vite-plugin/README.md
+++ b/packages/vite-plugin/README.md
@@ -21,7 +21,7 @@ npm install --save-dev @lingui/vite-plugin
 
 ```ts
 import { UserConfig } from 'vite';
-import lingui from '@lingui/vite-plugin'
+import { lingui } from '@lingui/vite-plugin'
 
 const config: UserConfig = {
   plugins: [lingui()]
diff --git a/packages/vite-plugin/index.js b/packages/vite-plugin/index.js
index c14e96c06..ddb47d948 100644
--- a/packages/vite-plugin/index.js
+++ b/packages/vite-plugin/index.js
@@ -1 +1 @@
-export { default } from "./src"
+export { default, lingui } from "./src"
diff --git a/packages/vite-plugin/src/index.ts b/packages/vite-plugin/src/index.ts
index 860f72082..3360e683e 100644
--- a/packages/vite-plugin/src/index.ts
+++ b/packages/vite-plugin/src/index.ts
@@ -15,7 +15,7 @@ type LinguiConfigOpts = {
   skipValidation?: boolean
 }
 
-export default function lingui(linguiConfig: LinguiConfigOpts = {}): Plugin {
+export function lingui(linguiConfig: LinguiConfigOpts = {}): Plugin {
   const config = getConfig(linguiConfig)
 
   return {
@@ -56,3 +56,5 @@ export default function lingui(linguiConfig: LinguiConfigOpts = {}): Plugin {
     },
   }
 }
+
+export default lingui
diff --git a/packages/vite-plugin/test/index.ts b/packages/vite-plugin/test/index.ts
index 9cf8af9a1..b5c1c5157 100644
--- a/packages/vite-plugin/test/index.ts
+++ b/packages/vite-plugin/test/index.ts
@@ -1,9 +1,9 @@
 import path from "path"
-import vitePlugin from "../src"
+import { lingui } from "../src"
 
 describe("vite-plugin", () => {
   it("should return compiled catalog", async () => {
-    const p = vitePlugin({
+    const p = lingui({
       configPath: path.resolve(__dirname, ".linguirc"),
     })
     const result = await (p.transform as any)(
diff --git a/website/docs/ref/vite-plugin.md b/website/docs/ref/vite-plugin.md
index fc6803d7b..7634da549 100644
--- a/website/docs/ref/vite-plugin.md
+++ b/website/docs/ref/vite-plugin.md
@@ -18,7 +18,7 @@ Simply add `@lingui/vite-plugin` inside your `vite.config.ts`:
 
 ```ts title="vite.config.ts"
 import { UserConfig } from 'vite';
-import lingui from '@lingui/vite-plugin'
+import { lingui } from '@lingui/vite-plugin'
 
 const config: UserConfig = {
   plugins: [lingui()]