move test, cleanup

Author: amannn

packages/next-intl/src/extractor/ExtractionCompiler.test.tsx

@@ -1103,6 +1103,83 @@ msgstr "Hallo!"
     `);
   });
 
+  it('sorts messages by reference path when files are compiled out of order', async () => {
+    using compiler = createCompiler();
+
+    await compiler.compile(
+      '/project/src/a.tsx',
+      `
+    import {useExtracted} from 'next-intl';
+    export default function A() {
+      const t = useExtracted();
+      return <div>{t('Message A')}</div>;
+    }
+    `
+    );
+
+    await compiler.compile(
+      '/project/src/d.tsx',
+      `
+    import {useExtracted} from 'next-intl';
+    export default function D() {
+      const t = useExtracted();
+      return <div>{t('Message B')}</div>;
+    }
+    `
+    );
+
+    await compiler.compile(
+      '/project/src/c.tsx',
+      `
+    import {useExtracted} from 'next-intl';
+    export default function C() {
+      const t = useExtracted();
+      return <div>{t('Message C')}</div>;
+    }
+    `
+    );
+
+    await compiler.compile(
+      '/project/src/b.tsx',
+      `
+    import {useExtracted} from 'next-intl';
+    export default function B() {
+      const t = useExtracted();
+      return <div>{t('Message B')}</div>;
+    }
+    `
+    );
+
+    await waitForWriteFileCalls(5);
+
+    expect(vi.mocked(fs.writeFile).mock.calls.at(-1)).toMatchInlineSnapshot(`
+      [
+        "messages/en.po",
+        "msgid ""
+      msgstr ""
+      "Language: en\\n"
+      "Content-Type: text/plain; charset=utf-8\\n"
+      "Content-Transfer-Encoding: 8bit\\n"
+      "X-Generator: next-intl\\n"
+      "X-Crowdin-SourceKey: msgstr\\n"
+
+      #: src/a.tsx
+      msgid "PmvAXH"
+      msgstr "Message A"
+
+      #: src/b.tsx
+      #: src/d.tsx
+      msgid "5bb321"
+      msgstr "Message B"
+
+      #: src/c.tsx
+      msgid "c3UbA2"
+      msgstr "Message C"
+      ",
+      ]
+    `);
+  });
+
   it('initializes all messages to empty string when adding new catalog', async () => {
     filesystem.project.messages = undefined;
     filesystem.project.src['Greeting.tsx'] = `

packages/next-intl/src/extractor/catalog/CatalogManager.test.tsx

@@ -202,13 +202,9 @@ export default class CatalogManager {
         // reference, which is the current file. We need to merge this with
         // potentially existing references.
         const references = [...(prevMessage.references ?? [])];
-        message.references.forEach((reference) => {
-          if (
-            !references.some(
-              (existingReference) => existingReference.path === reference.path
-            )
-          ) {
-            references.push(reference);
+        message.references.forEach((ref) => {
+          if (!references.some((cur) => cur.path === ref.path)) {
+            references.push(ref);
           }
         });
         references.sort((referenceA, referenceB) =>