fix(cli): catalogsMergePath generates only one compiled locale (#2238)

Author: timofei-iatsenko

packages/cli/src/lingui-compile.ts

@@ -84,13 +84,17 @@ export async function command(
     }
 
     if (doMerge) {
-      return await compileAndWrite(
+      const result = await compileAndWrite(
         locale,
         config,
         options,
         await getCatalogForMerge(config),
         mergedCatalogs
       )
+
+      if (!result) {
+        return false
+      }
     }
   }
   return true

packages/cli/src/test/__snapshots__/compile.test.ts.snap

@@ -43,3 +43,5 @@ These errors fail command execution because \`--strict\` option passed
 `;
 
 exports[`CLI Command: Compile merge Should merge individual catalogs if  catalogsMergePath specified in lingui config 1`] = `/*eslint-disable*/module.exports={messages:JSON.parse("{\\"Z3YTTJ\\":[\\"Foo Hello World\\"],\\"iWZSiH\\":[\\"Bar Hello World\\"]}")};`;
+
+exports[`CLI Command: Compile merge Should merge individual catalogs if  catalogsMergePath specified in lingui config 2`] = `/*eslint-disable*/module.exports={messages:JSON.parse("{\\"Z3YTTJ\\":[\\"[PL] Foo Hello World\\"],\\"iWZSiH\\":[\\"[PL] Bar Hello World\\"]}")};`;

packages/cli/src/test/compile.test.ts

@@ -187,7 +187,7 @@ msgstr "Hello {hello"
   describe("merge", () => {
     function getConfig(rootDir: string, pseudoLocale?: string) {
       return makeConfig({
-        locales: ["en"],
+        locales: ["en", "pl"],
         sourceLocale: "en",
         pseudoLocale: pseudoLocale,
         rootDir,
@@ -206,7 +206,7 @@ msgstr "Hello {hello"
     }
 
     it("Should merge individual catalogs if  catalogsMergePath specified in lingui config", async () => {
-      expect.assertions(3)
+      expect.assertions(4)
 
       const rootDir = await createFixtures({
         "/components/foo.tsx": "",
@@ -219,6 +219,14 @@ msgstr "Foo Hello World"
 msgid "Bar Hello World"
 msgstr "Bar Hello World"
         `,
+        "/pl/foo.tsx.po": `
+msgid "Foo Hello World"
+msgstr "[PL] Foo Hello World"
+        `,
+        "/pl/bar.tsx.po": `
+msgid "Bar Hello World"
+msgstr "[PL] Bar Hello World"
+        `,
       })
 
       const config = getConfig(rootDir)
@@ -228,6 +236,7 @@ msgstr "Bar Hello World"
 
         const actualFiles = readFsToListing(config.rootDir)
         expect(actualFiles["merged/en.js"]).toMatchSnapshot()
+        expect(actualFiles["merged/pl.js"]).toMatchSnapshot()
 
         const log = getConsoleMockCalls(console.error)
         expect(log).toBeUndefined()