chore: stop using legacy deps, use --force for now. Update @reduxjs/t…

…oolkit and move more test files to .mjs

.github/workflows/lint.yml

@@ -36,9 +36,9 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - uses: actions/setup-node@v4
         with:
-          node-version: "16"
+          node-version: "20"
       - name: Install dependencies
-        run: npm ci
+        run: npm ci --force
       - name: eslint
         run: npm run test:lint
       - name: Prettier

.github/workflows/unit.yml

@@ -32,8 +32,8 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - uses: actions/setup-node@v4
         with:
-          node-version: "16"
+          node-version: "20"
       - name: Install dependencies
-        run: npm ci
+        run: npm ci --force
       - name: Run jest tests
         run: npm run test:jest

addon/content/stub.js

@@ -20,7 +20,6 @@ document.addEventListener(
 
     let store = RTK.configureStore({
       reducer: conversationApp,
-      middleware: RTK.getDefaultMiddleware(),
     });
 
     // Once we can potentially load in a WebExtension scope, then we should

addon/tests/conversationUtils.test.js → addon/tests/conversationUtils.test.mjs

@@ -2,8 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import { createFakeData } from "./utils.js";
-import { jest } from "@jest/globals";
+import { createFakeData } from "./utils.mjs";
 import { conversationUtils } from "../content/reducer/conversationUtils.js";
 
 describe("conversationUtils", () => {

addon/tests/messages.test.js → addon/tests/messages.test.mjs

@@ -2,8 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import { createFakeData, createFakeSummaryData } from "./utils.js";
-import { jest } from "@jest/globals";
+import { createFakeData, createFakeSummaryData } from "./utils.mjs";
 import { MessageEnricher } from "../content/reducer/messageEnricher.js";
 
 describe("messageEnricher", () => {
@@ -174,16 +173,16 @@ describe("messageEnricher", () => {
 
       mailTabsGetSpy.mockReturnValue(false);
 
-      for (let test of tests) {
-        let fakeMsg = createFakeData(test.source, fakeMessageHeaderData);
+      for (let t of tests) {
+        let fakeMsg = createFakeData(t.source, fakeMessageHeaderData);
 
         let msgs = await messageEnricher.enrich(
           [fakeMsg],
           createFakeSummaryData({ noFriendlyDate: true }),
           [3]
         );
 
-        expect(msgs[0]).toMatchObject(test.expected);
+        expect(msgs[0]).toMatchObject(t.expected);
       }
     });
 

addon/tests/prefs.test.js → addon/tests/prefs.test.mjs

@@ -8,8 +8,6 @@ import {
   kCurrentLegacyMigration,
 } from "../background/prefs.mjs";
 
-import { jest } from "@jest/globals";
-
 describe("Prefs tests", () => {
   let prefs;
 

addon/tests/quickReply.test.jsx

@@ -19,7 +19,6 @@ describe("Quick Reply tests", () => {
   beforeEach(async () => {
     store = RTK.configureStore({
       reducer: conversationApp,
-      middleware: RTK.getDefaultMiddleware(),
     });
     quickReplyActions.expand = jest.fn().mockImplementation(() => {
       return {

addon/tests/reducerCompose.test.js → addon/tests/reducerCompose.test.mjs

@@ -2,7 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import { jest } from "@jest/globals";
 import * as RTK from "@reduxjs/toolkit";
 import * as Redux from "redux";
 

addon/tests/reducerController.test.js → addon/tests/reducerController.test.mjs

@@ -2,8 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import { createFakeData, createFakeSummaryData } from "./utils.js";
-import { jest } from "@jest/globals";
+import { createFakeData, createFakeSummaryData } from "./utils.mjs";
 import * as RTK from "@reduxjs/toolkit";
 import * as Redux from "redux";
 

addon/tests/reducerQuickReply.test.js → addon/tests/reducerQuickReply.test.mjs

@@ -2,10 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import { jest } from "@jest/globals";
 import * as RTK from "@reduxjs/toolkit";
 import * as Redux from "redux";
-import { createFakeData } from "./utils.js";
+import { createFakeData } from "./utils.mjs";
 
 // Import the components we want to test
 import {

addon/tests/setup.js → addon/tests/setup.mjs

@@ -4,6 +4,7 @@
 
 /* eslint-env node */
 
+// eslint-disable-next-line no-shadow
 import { browser } from "../content/esmodules/thunderbirdCompat.js";
 import fileSystem from "fs";
 import path from "path";

babel.config.cjs

@@ -8,7 +8,7 @@ module.exports = function (api) {
       {
         targets: { browsers: "Firefox >= 110.0" },
         // Use commonjs for now until the ecosystem sorts itself out.
-        modules: "commonjs",
+        modules: "auto",
       },
     ],
     [