Update tests to use the public entry point to the module (#171)

matrix-org · Nov 29, 2024 · 81a02f6 · 81a02f6
1 parent 39b253c
commit 81a02f6
Show file tree

Hide file tree

Showing 20 changed files with 144 additions and 80 deletions.
diff --git a/package.json b/package.json
@@ -18,8 +18,12 @@
         "ruma",
         "nio"
     ],
-    "main": "pkg/index.js",
-    "types": "pkg/index.d.ts",
+    "exports": {
+        ".": {
+            "types": "./pkg/index.d.ts",
+            "default": "./pkg/index.js"
+        }
+    },
     "files": [
         "pkg/matrix_sdk_crypto_wasm_bg.wasm.js",
         "pkg/matrix_sdk_crypto_wasm_bg.wasm.d.ts",
@@ -30,20 +34,21 @@
         "@babel/core": "^7.23.5",
         "@babel/preset-env": "^7.23.5",
         "@babel/preset-typescript": "^7.23.3",
+        "@tsconfig/node18": "^18.2.4",
         "@types/jest": "^29.5.10",
         "babel-jest": "^29.7.0",
         "cross-env": "^7.0.3",
         "eslint": "^8.55.0",
         "fake-indexeddb": "^4.0",
         "jest": "^28.1.0",
         "prettier": "^2.8.3",
-        "typedoc": "^0.22.17",
-        "typescript": "4.7",
+        "typedoc": "^0.27.1",
+        "typescript": "5.7.2",
         "wasm-pack": "^0.12.1",
         "yargs-parser": "~21.0.1"
     },
     "engines": {
-        "node": ">= 10"
+        "node": ">= 18"
     },
     "scripts": {
         "lint": "npm run lint:eslint && npm run lint:prettier && npm run lint:types",

diff --git a/tests/asyncload.test.js b/tests/asyncload.test.js
@@ -1,4 +1,4 @@
-const { UserId, initAsync } = require("../pkg");
+const { UserId, initAsync } = require("@matrix-org/matrix-sdk-crypto-wasm");
 
 test("can instantiate rust objects with async initialiser", async () => {
     initUserId = () => new UserId("@foo:bar.org");

diff --git a/tests/attachment.test.js b/tests/attachment.test.js
@@ -1,4 +1,4 @@
-const { Attachment, EncryptedAttachment } = require("../pkg");
+const { Attachment, EncryptedAttachment } = require("@matrix-org/matrix-sdk-crypto-wasm");
 
 describe(Attachment.name, () => {
     const originalData = "hello";

diff --git a/tests/backup.test.js b/tests/backup.test.js
@@ -1,4 +1,4 @@
-const { BackupDecryptionKey } = require("../pkg");
+const { BackupDecryptionKey } = require("@matrix-org/matrix-sdk-crypto-wasm");
 
 const aMegolmKey = {
     algorithm: "m.megolm.v1.aes-sha2",

diff --git a/tests/dehydrated_devices.test.ts b/tests/dehydrated_devices.test.ts
@@ -10,7 +10,7 @@ import {
     RoomId,
     TrustRequirement,
     UserId,
-} from "../pkg/matrix_sdk_crypto_wasm";
+} from "@matrix-org/matrix-sdk-crypto-wasm";
 import "fake-indexeddb/auto";
 
 afterEach(() => {

diff --git a/tests/device.test.js b/tests/device.test.js
@@ -25,12 +25,12 @@ const {
     Qr,
     QrCode,
     QrCodeScan,
-} = require("../pkg");
+} = require("@matrix-org/matrix-sdk-crypto-wasm");
 const { zip, addMachineToMachine } = require("./helper");
-const { VerificationRequestPhase, QrState } = require("../pkg");
+const { VerificationRequestPhase, QrState } = require("@matrix-org/matrix-sdk-crypto-wasm");
 
 // Uncomment to enable debug logging for tests
-//const { Tracing, LoggerLevel } = require("../pkg");
+//const { Tracing, LoggerLevel } = require("@matrix-org/matrix-sdk-crypto-wasm");
 //new Tracing(LoggerLevel.Trace).turnOn();
 
 describe("LocalTrust", () => {

diff --git a/tests/ecies.test.ts b/tests/ecies.test.ts
@@ -1,4 +1,11 @@
-const { Ecies, SecretsBundle, UserId, DeviceId, OlmMachine, RequestType } = require("../pkg/matrix_sdk_crypto_wasm");
+const {
+    Ecies,
+    SecretsBundle,
+    UserId,
+    DeviceId,
+    OlmMachine,
+    RequestType,
+} = require("@matrix-org/matrix-sdk-crypto-wasm");
 
 describe(Ecies.name, () => {
     test("can establish a channel and decrypt the initial message", () => {

diff --git a/tests/encryption.test.js b/tests/encryption.test.js
@@ -4,7 +4,7 @@ const {
     EncryptionSettings,
     HistoryVisibility,
     VerificationState,
-} = require("../pkg");
+} = require("@matrix-org/matrix-sdk-crypto-wasm");
 
 describe("EncryptionAlgorithm", () => {
     test("has the correct variant values", () => {

diff --git a/tests/events.test.js b/tests/events.test.js
@@ -1,4 +1,4 @@
-const { HistoryVisibility } = require("../pkg");
+const { HistoryVisibility } = require("@matrix-org/matrix-sdk-crypto-wasm");
 
 describe("HistoryVisibility", () => {
     test("has the correct variant values", () => {

diff --git a/tests/helper.js b/tests/helper.js
@@ -1,4 +1,4 @@
-const { DeviceLists, RequestType, KeysUploadRequest, KeysQueryRequest } = require("../pkg");
+const { DeviceLists, RequestType, KeysUploadRequest, KeysQueryRequest } = require("@matrix-org/matrix-sdk-crypto-wasm");
 
 function* zip(...arrays) {
     const len = Math.min(...arrays.map((array) => array.length));

diff --git a/tests/identifiers.test.js b/tests/identifiers.test.js
@@ -7,7 +7,7 @@ const {
     RoomId,
     ServerName,
     UserId,
-} = require("../pkg");
+} = require("@matrix-org/matrix-sdk-crypto-wasm");
 
 describe(UserId.name, () => {
     test("cannot be invalid", () => {

diff --git a/tests/libolm_migration.test.ts b/tests/libolm_migration.test.ts
@@ -26,7 +26,7 @@ import {
     StoreHandle,
     Tracing,
     UserId,
-} from "../pkg";
+} from "@matrix-org/matrix-sdk-crypto-wasm";
 
 beforeAll(() => {
     new Tracing(LoggerLevel.Trace).turnOn();

diff --git a/tests/machine.test.ts b/tests/machine.test.ts
@@ -36,7 +36,7 @@ import {
     OtherUserIdentity,
     VerificationRequest,
     Versions,
-} from "../pkg";
+} from "@matrix-org/matrix-sdk-crypto-wasm";
 import "fake-indexeddb/auto";
 import * as crypto from "node:crypto";
 

diff --git a/tests/qr_code.test.js b/tests/qr_code.test.js
@@ -1,4 +1,4 @@
-const { QrCodeData, QrCodeMode, Curve25519PublicKey } = require("../pkg/matrix_sdk_crypto_wasm");
+const { QrCodeData, QrCodeMode, Curve25519PublicKey } = require("@matrix-org/matrix-sdk-crypto-wasm");
 
 describe(QrCodeData.name, () => {
     test("can parse the QR code bytes from the MSC", () => {

diff --git a/tests/requests.test.js b/tests/requests.test.js
@@ -7,7 +7,7 @@ const {
     SignatureUploadRequest,
     RoomMessageRequest,
     KeysBackupRequest,
-} = require("../pkg");
+} = require("@matrix-org/matrix-sdk-crypto-wasm");
 
 describe("RequestType", () => {
     test("has the correct variant values", () => {

diff --git a/tests/sync_events.test.js b/tests/sync_events.test.js
@@ -1,4 +1,4 @@
-const { DeviceLists, UserId } = require("../pkg");
+const { DeviceLists, UserId } = require("@matrix-org/matrix-sdk-crypto-wasm");
 
 describe(DeviceLists.name, () => {
     test("can be empty", () => {

diff --git a/tests/tracing.test.js b/tests/tracing.test.js
@@ -1,4 +1,4 @@
-const { Tracing, LoggerLevel, OlmMachine, UserId, DeviceId } = require("../pkg");
+const { Tracing, LoggerLevel, OlmMachine, UserId, DeviceId } = require("@matrix-org/matrix-sdk-crypto-wasm");
 
 describe("LoggerLevel", () => {
     test("has the correct variant values", () => {

diff --git a/tests/vodozemac_types.test.ts b/tests/vodozemac_types.test.ts
@@ -1,4 +1,4 @@
-const { Curve25519PublicKey } = require("../pkg");
+const { Curve25519PublicKey } = require("@matrix-org/matrix-sdk-crypto-wasm");
 
 describe(Curve25519PublicKey.name, () => {
     test("Can create a Curve25519PublicKey from a base64 string", async () => {

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,6 +1,7 @@
 {
+    "extends": "@tsconfig/node18/tsconfig.json",
     "compilerOptions": {
-        "strict": true
+        "lib": ["DOM"]
     },
     "typedocOptions": {
         "entryPoints": ["pkg/matrix_sdk_crypto_wasm.d.ts"],